From 9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 4 Aug 2011 15:50:48 -0400 Subject: [PATCH] Properly tokenize nameserver line for servers with IPv6 address --- ChangeLog | 5 +++++ resolv/res_init.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0392853..76aef93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-07-22 Andreas Schwab + + * resolv/res_init.c (__res_vinit): Properly tokenize nameserver + line. + 2011-07-26 Andreas Schwab * 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'; -- 2.7.4