diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-08-04 15:50:48 -0400 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-08-05 10:04:14 +0200 |
| commit | e2a309033d626c4b643afaf7e7ad2ccf4930dc35 (patch) | |
| tree | bfc3d12eb0cd0ed86d8843ed5522cd034a4cc7ae | |
| parent | c57be1aeee682c02664e5d92b8c597a376611bfe (diff) | |
| download | glibc-e2a309033d626c4b643afaf7e7ad2ccf4930dc35.tar glibc-e2a309033d626c4b643afaf7e7ad2ccf4930dc35.tar.gz glibc-e2a309033d626c4b643afaf7e7ad2ccf4930dc35.tar.bz2 glibc-e2a309033d626c4b643afaf7e7ad2ccf4930dc35.zip | |
Properly tokenize nameserver line for servers with IPv6 address
(cherry picked from commit 9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | resolv/res_init.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 64934b0e5f..73caaa4c5e 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'; |