aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-12-03 05:20:19 +0000
committerUlrich Drepper <drepper@redhat.com>2008-12-03 05:20:19 +0000
commit6f5c31171fbd45c79c9bbeea4d6305f9c798e421 (patch)
treebee1068851341a4bd5324c23f9010390882ef80b
parentf93fc0b75a50d3ba8d4d69313e3c84ac0b62905b (diff)
downloadglibc-6f5c31171fbd45c79c9bbeea4d6305f9c798e421.zip
glibc-6f5c31171fbd45c79c9bbeea4d6305f9c798e421.tar.gz
glibc-6f5c31171fbd45c79c9bbeea4d6305f9c798e421.tar.bz2
* resolv/res_init.c (__res_vinit): Fill in IPv4 name server
information at the correct index.
-rw-r--r--ChangeLog3
-rw-r--r--NEWS4
-rw-r--r--resolv/res_init.c6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f8f522..c834934 100644
--- 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 f9c8b18..095dbab 100644
--- 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.
Version 2.10
+* New Linux interface: accept4
+
Version 2.9
diff --git a/resolv/res_init.c b/resolv/res_init.c
index a284096..d93dc82 100644
--- 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