about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-09-14 00:01:42 -0700
committerAndreas Schwab <schwab@redhat.com>2010-12-01 15:35:11 +0100
commit36f5b87d0e54ffb3efa3ebec86a77bc89b1b98f7 (patch)
tree0a627d68a375d5203a9b7965df257de48f2b3bc8
parenta182ec598f54bb75ac96a34a79103bc902326ac6 (diff)
downloadglibc-36f5b87d0e54ffb3efa3ebec86a77bc89b1b98f7.tar.gz
glibc-36f5b87d0e54ffb3efa3ebec86a77bc89b1b98f7.tar.xz
glibc-36f5b87d0e54ffb3efa3ebec86a77bc89b1b98f7.zip
Actually make it possible to user the default name server.
(cherry picked from commit e66e7419a6f58200eec6941b14e2dcff9875cc6c)
-rw-r--r--ChangeLog4
-rw-r--r--resolv/res_init.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ba71b648f9..ad8a25f245 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* resolv/res_init.c (__res_vinit): Count the default server we added.
+
 2010-08-25  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #10851]
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 202569ddac..74715f34e9 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -430,6 +430,7 @@ __res_vinit(res_state statp, int preinit) {
 	    statp->nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
 	    statp->nsaddr.sin_family = AF_INET;
 	    statp->nsaddr.sin_port = htons(NAMESERVER_PORT);
+	    statp->nscount = 1;
 	}
 	if (statp->defdname[0] == 0 &&
 	    __gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&