diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-09-11 12:14:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-09-11 12:14:37 +0000 |
| commit | 04795ad9025b5f7891eb746fa6f29d1251d2c0b5 (patch) | |
| tree | 40686d38e2842b7537b699dfb0655b0dfdfd6881 /resolv/res_init.c | |
| parent | 5e0889da396b35ef7d57d43dca6f09899e4c8d66 (diff) | |
| download | glibc-04795ad9025b5f7891eb746fa6f29d1251d2c0b5.tar.gz glibc-04795ad9025b5f7891eb746fa6f29d1251d2c0b5.tar.xz glibc-04795ad9025b5f7891eb746fa6f29d1251d2c0b5.zip | |
Update.
1998-09-11 Ulrich Drepper <drepper@cygnus.com> * resolv/res_init.c (res_init): Handle resolv.conf file with only one nameserver correctly. Patch by HJ Lu. * iconvdata/Makefile (modules): Add IEC_P27-1, BALTIC, ASMO_449, and ANSI_X3.110. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add iec_p27-1.h, baltic.h, and asmo_449.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. Pretty print. * iconvdata/ansi_x3.110.c: New file. * iconvdata/asmo_449.c: New file. * iconvdata/baltic.c: New file. * iconvdata/iec_p27-1.c: New file. * iconvdata/t61.c (from_ucs4): Correct 0x23, 0x24, 0x80, and 0x81 entries. Convert U02dc correctly. * math/atest-exp.c: Add parentheses to avoid gcc warnings. * math/atest-exp2.c: Likewise. * math/atest-sincos.c: Likewise. * posix/getopt.h: Don't define non-POSIX stuff unless _GNU_SOURCE is defined. 1998-09-11 10:51 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/strcoll.c: Optimize a few expressions. * string/strxfrm.c: Likewise.
Diffstat (limited to 'resolv/res_init.c')
| -rw-r--r-- | resolv/res_init.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/resolv/res_init.c b/resolv/res_init.c index 2d2459d5a3..893072f24e 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -207,13 +207,12 @@ res_init() #ifdef USELOOPBACK _res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1); _res.nscount = 1; - _res.nsaddr.sin_port = htons(NAMESERVER_PORT); #else _res.nsaddr.sin_addr.s_addr = INADDR_ANY; _res.nscount = 0; - _res.nsaddr.sin_port = 0; #endif _res.nsaddr.sin_family = AF_INET; + _res.nsaddr.sin_port = htons(NAMESERVER_PORT); _res.ndots = 1; _res.pfcode = 0; @@ -380,7 +379,7 @@ res_init() continue; } } - if (nserv > 1) + if (nserv > _res.nscount) _res.nscount = nserv; #ifdef RESOLVSORT _res.nsort = nsort; @@ -573,7 +572,7 @@ netinfo_res_init(haveenv, havesearch) ni_namelist_free(&nl); } - if (nserv > 1) + if (nserv > _res.nscount) _res.nscount = nserv; #ifdef RESOLVSORT |