summaryrefslogtreecommitdiff
path: root/libc/inet
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2010-04-12 06:18:10 -0700
committerAustin Foxley <austinf@cetoncorp.com>2010-04-12 06:18:10 -0700
commit6cc4f58c6382c850ce97f32f56d1a3ff00ca4585 (patch)
tree19a2f25da5db93c2cb620c0da3c38d3bffd0b784 /libc/inet
parentc58dd2b2aabda615aa333cdbb023defbf00b30a3 (diff)
parente90c33f951efc032ca23f48326343a83c0b54b10 (diff)
Merge remote branch 'origin/master' into nptl
Conflicts: libc/unistd/confstr.c Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/inet')
-rw-r--r--libc/inet/resolv.c6
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)