mirror of
https://sourceware.org/git/glibc.git
synced 2025-06-15 06:41:47 +03:00
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.
This commit is contained in:
@ -259,11 +259,11 @@ getanswer(answer, anslen, qname, qtype)
|
||||
}
|
||||
cp += n; /* name */
|
||||
BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
|
||||
type = _getshort(cp);
|
||||
type = ns_get16(cp);
|
||||
cp += INT16SZ; /* type */
|
||||
class = _getshort(cp);
|
||||
class = ns_get16(cp);
|
||||
cp += INT16SZ + INT32SZ; /* class, TTL */
|
||||
n = _getshort(cp);
|
||||
n = ns_get16(cp);
|
||||
cp += INT16SZ; /* len */
|
||||
BOUNDS_CHECK(cp, n);
|
||||
erdata = cp + n;
|
||||
@ -491,7 +491,7 @@ gethostbyname(name)
|
||||
{
|
||||
struct hostent *hp;
|
||||
|
||||
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
||||
if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1) {
|
||||
__set_h_errno (NETDB_INTERNAL);
|
||||
return (NULL);
|
||||
}
|
||||
@ -514,7 +514,7 @@ gethostbyname2(name, af)
|
||||
int n, size, type, len;
|
||||
extern struct hostent *_gethtbyname2();
|
||||
|
||||
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
||||
if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1) {
|
||||
__set_h_errno (NETDB_INTERNAL);
|
||||
return (NULL);
|
||||
}
|
||||
@ -613,8 +613,8 @@ gethostbyname2(name, af)
|
||||
break;
|
||||
}
|
||||
|
||||
if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf.buf))) < 0) {
|
||||
dprintf("res_search failed (%d)\n", n);
|
||||
if ((n = res_nsearch(&_res, name, C_IN, type, buf.buf, sizeof(buf.buf))) < 0) {
|
||||
dprintf("res_nsearch failed (%d)\n", n);
|
||||
if (errno == ECONNREFUSED)
|
||||
return (_gethtbyname2(name, af));
|
||||
return (NULL);
|
||||
@ -643,7 +643,7 @@ gethostbyaddr(addr, len, af)
|
||||
#endif /*SUNSECURITY*/
|
||||
extern struct hostent *_gethtbyaddr();
|
||||
|
||||
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
||||
if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1) {
|
||||
__set_h_errno (NETDB_INTERNAL);
|
||||
return (NULL);
|
||||
}
|
||||
@ -693,9 +693,9 @@ gethostbyaddr(addr, len, af)
|
||||
default:
|
||||
abort();
|
||||
}
|
||||
n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
|
||||
n = res_nquery(&_res, qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
|
||||
if (n < 0) {
|
||||
dprintf("res_query failed (%d)\n", n);
|
||||
dprintf("res_nquery failed (%d)\n", n);
|
||||
if (errno == ECONNREFUSED)
|
||||
return (_gethtbyaddr(addr, len, af));
|
||||
return (NULL);
|
||||
|
Reference in New Issue
Block a user