[commits] r11526 - in /fsf/trunk/libc: ChangeLog resolv/res_init.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Sep 15 00:03:35 2010
New Revision: 11526

Log:
Import glibc-mainline for 2010-09-15

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/resolv/res_init.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Sep 15 00:03:35 2010
@@ -1,3 +1,7 @@
+2010-09-14  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* resolv/res_init.c (__res_vinit): Count the default server we added.
+
 2010-09-08  Chung-Lin Tang  <cltang@xxxxxxxxxxxxxxxx>
 	    Ulrich Drepper  <drepper@xxxxxxxxxx>
 

Modified: fsf/trunk/libc/resolv/res_init.c
==============================================================================
--- fsf/trunk/libc/resolv/res_init.c (original)
+++ fsf/trunk/libc/resolv/res_init.c Wed Sep 15 00:03:35 2010
@@ -430,6 +430,7 @@
 	    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 &&