From b43b13ac2544b11f35be301d1589b51a8473e32b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 4 Dec 1999 18:05:55 +0000 Subject: Update. 1999-12-03 Andreas Jaeger * nss/getXXbyYY.c: Include (FUNCTION_NAME): Use res_ninit instead of res_init. * nss/getXXbyYY_r.c [NEED__RES]: Include for _res declaration and prototypes. Remove extra _res declaration. (INTERNAL): Use thread aware res_ninit function. * inet/gethstbyad_r.c: Include . * 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 . * sysdeps/unix/sysv/linux/configure.in: Remove check for ldconfig, set always use_ldconfig instead. --- nss/getXXbyYY.c | 3 ++- nss/getXXbyYY_r.c | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'nss') diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c index 1a8271ea6b..32327d6d1e 100644 --- a/nss/getXXbyYY.c +++ b/nss/getXXbyYY.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "nsswitch.h" @@ -104,7 +105,7 @@ FUNCTION_NAME (ADD_PARAMS) #ifdef HANDLE_DIGITS_DOTS /* We have to test for the use of IPv6 which can only be done by examining `_res'. */ - if ((_res.options & RES_INIT) == 0 && res_init () == -1) + if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) { # ifdef NEED_H_ERRNO h_errno_tmp = NETDB_INTERNAL; diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index a3130e41ff..c3d2010434 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -26,7 +26,9 @@ #ifdef NEED__RES_HCONF # include #endif - +#ifdef NEED__RES +# include +#endif /*******************************************************************\ |* Here we assume several symbols to be defined: *| |* *| @@ -95,9 +97,6 @@ typedef enum nss_status (*lookup_function) (ADD_PARAMS, LOOKUP_TYPE *, char *, size_t, int * H_ERRNO_PARM); -/* Some usages of this file might use this variable. */ -extern struct __res_state _res; - /* The lookup function for the first entry of this service. */ extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp); @@ -126,7 +125,7 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer, #ifdef HANDLE_DIGITS_DOTS /* We have to test for the use of IPv6 which can only be done by examining `_res'. */ - if ((_res.options & RES_INIT) == 0 && res_init () == -1) + if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) { *h_errnop = NETDB_INTERNAL; *result = NULL; @@ -166,7 +165,7 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer, #ifdef NEED__RES /* The resolver code will really be used so we have to initialize it. */ - if ((_res.options & RES_INIT) == 0 && res_init () == -1) + if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) { *h_errnop = NETDB_INTERNAL; *result = NULL; -- cgit 1.4.1