mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 22:40:05 +00:00
e685e07dfa
2000-07-18 Mark Kettenis <kettenis@gnu.org> Update resolver code to BIND 8.2.3-T5B. * resolv/Versions [GLIBC_2.2] (libc): Add __res_init and __res_nclose. [GLIBC_2.2] (libresolv): Add __dn_expand, __ns_samename, __res_mkquery, __res_nsend, __res_query, __res_querydomain and __res_search. * resolv/Banner: BIND-8.2.3-T5B. * resolv/base64.c: Update from BIND 8.2.3-T5B. * resolv/herror.c: Likewise. * resolv/inet_addr.c: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/inet_neta.c: Likewise. * resolv/inet_ntop.c: Likewise. * resolv/nsap_addr.c: Likewise. * resolv/inet_pton.c: Likewise. Reject a few more more invalid IPv6 addresses (ISC bug #520). * resolv/ns_name.c: Avoid emitting RCS ID in object file. * resolv/ns_parse.c: Likewise. * resolv/ns_netint.c: Likewise. * resolv/ns_samedomain.c: Likewise. * resolv/ns_ttl.c: Likewise. * resolv/ns_print.c: Update from BIND 8.2.3-T5B. Avoid emitting RCS ID in object file. * resolv/res_debug.c: Update from BIND 8.2.3-T5B. * resolv/res_mkquery.c: Likewise. * resolv/res_query.c: Likewise. * resolv/res_init.c: Likewise. (res_setoptions): Mark internal. * resolv/res_send.c: Likewise. [_LIBC]: Fully reinstate the code that avoids the FD_SETSIZE limit by using poll instead. * resolv/res_comp.c: Likewise. [SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)]: Make dn_expand a weak alias for __dn_expand. * resolv/res_data.c: Likewise. (res_close) [_LIBC]: Don't call res_nclose if RES_INIT isn't set in _res.options. Avoids a potential security risk by avoiding a close (0). [SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)]: Make res_mkquery, res_query, res_querydomain adn res_search weak aliases for __res_mkquery, __res_query, __res_querydomain and __res_search. * resolv/res_libc.c: (_res): Don't initialize. Fix res_close instead to avoid close(0). (res_init): Always use the static resolver context. [SHLIB_COMPAT (libc, GLIBC_2.0, GLIBC_2_2)]: Make res_init a weak alias for __res_init. * resolv/resolv.h: Update from BIND 8.2.3-T5B. Move definition of RES_SET_H_ERRNO and accompanying comment to... * include/resolv.h: ... here. * resolv/arpa/namser.h: Update from BIND 8.2.3-T5B. * resolv/arpa/nameser_compat.h: Likewise.
89 lines
3.0 KiB
C
89 lines
3.0 KiB
C
/*
|
||
* Copyright (c) 1995-1999 by Internet Software Consortium.
|
||
*
|
||
* Permission to use, copy, modify, and distribute this software for any
|
||
* purpose with or without fee is hereby granted, provided that the above
|
||
* copyright notice and this permission notice appear in all copies.
|
||
*
|
||
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
||
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
||
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
||
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
||
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||
* SOFTWARE.
|
||
*/
|
||
|
||
#include <sys/types.h>
|
||
#include <netinet/in.h>
|
||
#include <arpa/nameser.h>
|
||
#include <resolv.h>
|
||
|
||
#undef _res
|
||
|
||
/* The resolver state for use by single-threaded programs. */
|
||
struct __res_state _res;
|
||
|
||
/* This function is used to access the resolver state in
|
||
single-threaded programs. */
|
||
struct __res_state *
|
||
weak_const_function
|
||
__res_state (void)
|
||
{
|
||
return &_res;
|
||
}
|
||
|
||
|
||
/* The following bit is copied from res_data.c (where it is #ifdef'ed
|
||
out) since res_init() should go into libc.so but the rest of that
|
||
file should not. */
|
||
|
||
int
|
||
res_init(void) {
|
||
extern int __res_vinit(res_state, int);
|
||
|
||
/*
|
||
* These three fields used to be statically initialized. This made
|
||
* it hard to use this code in a shared library. It is necessary,
|
||
* now that we're doing dynamic initialization here, that we preserve
|
||
* the old semantics: if an application modifies one of these three
|
||
* fields of _res before res_init() is called, res_init() will not
|
||
* alter them. Of course, if an application is setting them to
|
||
* _zero_ before calling res_init(), hoping to override what used
|
||
* to be the static default, we can't detect it and unexpected results
|
||
* will follow. Zero for any of these fields would make no sense,
|
||
* so one can safely assume that the applications were already getting
|
||
* unexpected results.
|
||
*
|
||
* _res.options is tricky since some apps were known to diddle the bits
|
||
* before res_init() was first called. We can't replicate that semantic
|
||
* with dynamic initialization (they may have turned bits off that are
|
||
* set in RES_DEFAULT). Our solution is to declare such applications
|
||
* "broken". They could fool us by setting RES_INIT but none do (yet).
|
||
*/
|
||
if (!_res.retrans)
|
||
_res.retrans = RES_TIMEOUT;
|
||
if (!_res.retry)
|
||
_res.retry = 4;
|
||
if (!(_res.options & RES_INIT))
|
||
_res.options = RES_DEFAULT;
|
||
|
||
/*
|
||
* This one used to initialize implicitly to zero, so unless the app
|
||
* has set it to something in particular, we can randomize it now.
|
||
*/
|
||
if (!_res.id)
|
||
_res.id = res_randomid();
|
||
|
||
return (__res_vinit(&_res, 1));
|
||
}
|
||
|
||
|
||
#include <shlib-compat.h>
|
||
|
||
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2)
|
||
# undef res_init
|
||
weak_alias (__res_init, res_init);
|
||
#endif
|