diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-04-09 23:17:34 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-04-12 15:50:11 +0200 |
| commit | 850da1f578f7694e6ed41008db346c14f4f89f3b (patch) | |
| tree | a3e2bd9418f9b3f84ba6585967519c0ba005e502 | |
| parent | eb1d8c8289f466ba3ad10b9a88ab2e426b8a9dc7 (diff) | |
| download | uClibc-alpine-850da1f578f7694e6ed41008db346c14f4f89f3b.tar.bz2 uClibc-alpine-850da1f578f7694e6ed41008db346c14f4f89f3b.tar.xz | |
resolv: tentatively fix usage of uninitialized DNS parameters
See "Possible regression from timeout commit for resolv.conf" thread.
Also remove superfluous NULL check.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | libc/inet/resolv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index 9459199da..84289a619 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -905,8 +905,8 @@ __UCLIBC_MUTEX_INIT(__resolv_lock, PTHREAD_MUTEX_INITIALIZER); /* Protected by __resolv_lock */ void (*__res_sync)(void); /*uint32_t __resolv_opts; */ -uint8_t __resolv_timeout; -uint8_t __resolv_attempts; +uint8_t __resolv_timeout = RES_TIMEOUT; +uint8_t __resolv_attempts = RES_DFLRETRY; unsigned __nameservers; unsigned __searchdomains; sockaddr46_t *__nameserver; @@ -1062,8 +1062,6 @@ void attribute_hidden __open_nameservers(void) if (p == NULL || (p1 = strchr(p, ':')) == NULL) continue; *p1++ = '\0'; - if (p1 == NULL) - continue; if (strcmp(p, "timeout") == 0) what = &__resolv_timeout; else if (strcmp(p, "attempts") == 0) |