diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-12-04 18:05:55 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-12-04 18:05:55 +0000 |
| commit | b43b13ac2544b11f35be301d1589b51a8473e32b (patch) | |
| tree | 6520da2e17c933ebc29b4572cdcc27410b10a4c4 /resolv/nss_dns/dns-network.c | |
| parent | 591e1ffbf8db5e059b9bcf3bde6d7758f018a46d (diff) | |
| download | glibc-b43b13ac2544b11f35be301d1589b51a8473e32b.tar.gz glibc-b43b13ac2544b11f35be301d1589b51a8473e32b.tar.xz glibc-b43b13ac2544b11f35be301d1589b51a8473e32b.zip | |
Update.
1999-12-03 Andreas Jaeger <aj@suse.de> * nss/getXXbyYY.c: Include <resolv.h> (FUNCTION_NAME): Use res_ninit instead of res_init. * nss/getXXbyYY_r.c [NEED__RES]: Include <resolv.h> for _res declaration and prototypes. Remove extra _res declaration. (INTERNAL): Use thread aware res_ninit function. * inet/gethstbyad_r.c: Include <resolv.h>. * resolv/res_data.c: Update from Bind 8.2.2-P5. Moved res_init to res_libc.c. Disabled unneeded functions. * resolv/res_libc.c: New file. * Versions.def: Add version GLIBC_2.2 for libpthread. Add versions GLIBC_2.1 and GLIBC_2.2 for libresolv. * include/resolv.h: Add internal interfaces. * resolv/Makefile (routines): Add new files. (libresolv-routines): Likewise. (distribute): Likewise. * resolv/gethnamaddr.c: Use thread safe resolver functions. * resolv/nss_dns/dns-host.c: Likewise. * resolv/nss_dns/dns-network.c: Likewise. * resolv/arpa/nameser.h: Update from Bind 8.2.2-P5. * resolv/nsap_addr.c: Likewise. * resolv/res_comp.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/res_init.c: Likewise. * resolv/res_mkquery.c: Likewise. * resolv/res_query.c: Likewise. * resolv/res_send.c: Likewise. * resolv/resolv.h: Likewise. * resolv/Versions: Add __res_state and __res_ninit with version GLIBC_2.2 to libc. Add new interfaces with version GLIBC_2.2 to libresolv. * resolv/Banner: Update. * include/arpa/nameser_compat.h: New file. * resolv/ns_name.c: New file from Bind 8.2.2-P5. * resolv/ns_netint.c: Likewise. * resolv/ns_parse.c: Likewise. * resolv/ns_print.c: Likewise. * resolv/ns_samedomain.c: Likewise. * resolv/ns_ttl.c: Likewise. * resolv/arpa/nameser_compat.h: Likewise. * resolv/res_debug.h: Likewise. Some patches are based on work done by Adam D. Bradley <artdodge@cs.bu.edu>. * sysdeps/unix/sysv/linux/configure.in: Remove check for ldconfig, set always use_ldconfig instead.
Diffstat (limited to 'resolv/nss_dns/dns-network.c')
| -rw-r--r-- | resolv/nss_dns/dns-network.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c index f81341cb39..b194852197 100644 --- a/resolv/nss_dns/dns-network.c +++ b/resolv/nss_dns/dns-network.c @@ -113,9 +113,12 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, int anslen; char *qbuf; + if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) + return NSS_STATUS_UNAVAIL; + qbuf = strdupa (name); - anslen = res_search (qbuf, C_IN, T_PTR, (u_char *) &net_buffer, - sizeof (querybuf)); + anslen = res_nsearch (&_res, qbuf, C_IN, T_PTR, (u_char *) &net_buffer, + sizeof (querybuf)); if (anslen < 0) { /* Nothing found. */ @@ -146,6 +149,9 @@ _nss_dns_getnetbyaddr_r (long net, int type, struct netent *result, if (type != AF_INET) return NSS_STATUS_UNAVAIL; + if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) + return NSS_STATUS_UNAVAIL; + net2 = (u_int32_t) net; for (cnt = 4; net2 != 0; net2 >>= 8) net_bytes[--cnt] = net2 & 0xff; @@ -172,8 +178,8 @@ _nss_dns_getnetbyaddr_r (long net, int type, struct netent *result, break; } - anslen = res_query (qbuf, C_IN, T_PTR, (u_char *) &net_buffer, - sizeof (querybuf)); + anslen = res_nquery (&_res, qbuf, C_IN, T_PTR, (u_char *) &net_buffer, + sizeof (querybuf)); if (anslen < 0) { /* Nothing found. */ |