Properly tokenize nameserver line for servers with IPv6 address

(cherry picked from commit 9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc)

diff --git a/ChangeLog b/ChangeLog
index cdaab23fafd2194004844d558b180495199c9dbe..0be6e1bf3298319d019f03ef7a70fbf20ac7eebb 100644 (file)
--- 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 64934b0e5f6e6c64807dd67add6a6a29f344c13b..73caaa4c5ea7c2de253e6a4cfd72f0d2a7e8619a 100644 (file)
--- 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';