From: Andreas Schwab <schwab@redhat.com>
Date: Thu, 4 Aug 2011 19:50:48 +0000 (-0400)
Subject: Properly tokenize nameserver line for servers with IPv6 address
X-Git-Tag: glibc-2.14.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a309033d626c4b643afaf7e7ad2ccf4930dc35;p=thirdparty%2Fglibc.git

Properly tokenize nameserver line for servers with IPv6 address
(cherry picked from commit 9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc)
---

diff --git a/ChangeLog b/ChangeLog
index cdaab23fafd..0be6e1bf329 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 64934b0e5f6..73caaa4c5ea 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';