* resolv/res_init.c (__res_vinit): Fill in IPv4 name server

	information at the correct index.

diff --git a/ChangeLog b/ChangeLog
index 9f8f52273d071269dcea5e3a40a14f545be34b6e..c83493492e0aaf7b9d5a395334ccd3be238f542e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-12-02  Ulrich Drepper  <drepper@redhat.com>
 
+       * resolv/res_init.c (__res_vinit): Fill in IPv4 name server
+       information at the correct index.
+
        * socket/sys/socket.h: Declare accept4.
        * socket/accept4.c: New file.
        * sysdeps/unix/sysv/linux/accept4.c: New file.

diff --git a/NEWS b/NEWS
index f9c8b18f161b68af4cdc03092ae84af95b174d69..095dbab44edbb79775bcdddd7f662f886c3989cd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2008-11-17
+GNU C Library NEWS -- history of user-visible changes.  2008-12-2
 Copyright (C) 1992-2007, 2008 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -7,6 +7,8 @@ using `glibc' in the "product" field.
 \f
 Version 2.10
 
+* New Linux interface: accept4
+
 \f
 Version 2.9
 

diff --git a/resolv/res_init.c b/resolv/res_init.c
index a2840968f3aec294824178fbf5d19a349c605c55..d93dc82718220df5a903a0abde73e76dceaba820 100644 (file)
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -314,9 +314,9 @@ __res_vinit(res_state statp, int preinit) {
                        cp++;
                    if ((*cp != '\0') && (*cp != '\n')
                        && __inet_aton(cp, &a)) {
-                       statp->nsaddr_list[nserv].sin_addr = a;
-                       statp->nsaddr_list[nserv].sin_family = AF_INET;
-                       statp->nsaddr_list[nserv].sin_port =
+                       statp->nsaddr_list[nservall].sin_addr = a;
+                       statp->nsaddr_list[nservall].sin_family = AF_INET;
+                       statp->nsaddr_list[nservall].sin_port =
                                htons(NAMESERVER_PORT);
                        nserv++;
 #ifdef _LIBC