From 6f5c31171fbd45c79c9bbeea4d6305f9c798e421 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 3 Dec 2008 05:20:19 +0000 Subject: [PATCH] * resolv/res_init.c (__res_vinit): Fill in IPv4 name server information at the correct index. --- ChangeLog | 3 +++ NEWS | 4 +++- resolv/res_init.c | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f8f52273d..c83493492e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-12-02 Ulrich Drepper + * 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 f9c8b18f16..095dbab44e 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 a2840968f3..d93dc82718 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 -- 2.11.4.GIT