diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-08-04 15:50:48 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-04 15:50:48 -0400 |
| commit | 9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc (patch) | |
| tree | 683de7029d45bb5deb6b56b5b3a77f68a2430101 | |
| parent | 2e96f1c73b06e81da59ef7fffa426dc201875f31 (diff) | |
| download | glibc-9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc.tar.gz glibc-9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc.tar.xz glibc-9be9bfcc9de543ac0ac335692cbbf8a0f46a2ccc.zip | |
Properly tokenize nameserver line for servers with IPv6 address
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | resolv/res_init.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 0392853b19..76aef93b10 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 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'; |