This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.14-148-g9be9bfc


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc (commit)
      from  2e96f1c73b06e81da59ef7fffa426dc201875f31 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc

commit 9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc
Author: Andreas Schwab <schwab@redhat.com>
Date:   Thu Aug 4 15:50:48 2011 -0400

    Properly tokenize nameserver line for servers with IPv6 address

diff --git a/ChangeLog b/ChangeLog
index 0392853..76aef93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-22  Andreas Schwab  <schwab@redhat.com>
+
+	* resolv/res_init.c (__res_vinit): Properly tokenize nameserver
+	line.
+
 2011-07-26  Andreas Schwab  <schwab@redhat.com>
 
 	* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't discard result of
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 64934b0..73caaa4 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -318,7 +318,7 @@ __res_vinit(res_state statp, int preinit) {
 			struct in6_addr a6;
 			char *el;
 
-			if ((el = strchr(cp, '\n')) != NULL)
+			if ((el = strpbrk(cp, " \t\n")) != NULL)
 			    *el = '\0';
 			if ((el = strchr(cp, SCOPE_DELIMITER)) != NULL)
 			    *el = '\0';

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    5 +++++
 resolv/res_init.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]