diff options
| -rw-r--r-- | ChangeLog | 62 | ||||
| -rw-r--r-- | include/resolv.h | 11 | ||||
| -rw-r--r-- | linuxthreads/manager.c | 1 | ||||
| -rw-r--r-- | resolv/Banner | 2 | ||||
| -rw-r--r-- | resolv/Versions | 9 | ||||
| -rw-r--r-- | resolv/arpa/nameser.h | 13 | ||||
| -rw-r--r-- | resolv/arpa/nameser_compat.h | 3 | ||||
| -rw-r--r-- | resolv/base64.c | 56 | ||||
| -rw-r--r-- | resolv/herror.c | 69 | ||||
| -rw-r--r-- | resolv/inet_addr.c | 79 | ||||
| -rw-r--r-- | resolv/inet_net_ntop.c | 8 | ||||
| -rw-r--r-- | resolv/inet_net_pton.c | 16 | ||||
| -rw-r--r-- | resolv/inet_neta.c | 4 | ||||
| -rw-r--r-- | resolv/inet_ntop.c | 27 | ||||
| -rw-r--r-- | resolv/inet_pton.c | 31 | ||||
| -rw-r--r-- | resolv/ns_name.c | 92 | ||||
| -rw-r--r-- | resolv/ns_netint.c | 4 | ||||
| -rw-r--r-- | resolv/ns_parse.c | 4 | ||||
| -rw-r--r-- | resolv/ns_print.c | 37 | ||||
| -rw-r--r-- | resolv/ns_samedomain.c | 4 | ||||
| -rw-r--r-- | resolv/ns_ttl.c | 5 | ||||
| -rw-r--r-- | resolv/nsap_addr.c | 8 | ||||
| -rw-r--r-- | resolv/res_comp.c | 30 | ||||
| -rw-r--r-- | resolv/res_data.c | 35 | ||||
| -rw-r--r-- | resolv/res_debug.c | 54 | ||||
| -rw-r--r-- | resolv/res_init.c | 47 | ||||
| -rw-r--r-- | resolv/res_libc.c | 56 | ||||
| -rw-r--r-- | resolv/res_mkquery.c | 10 | ||||
| -rw-r--r-- | resolv/res_query.c | 41 | ||||
| -rw-r--r-- | resolv/res_send.c | 1069 | ||||
| -rw-r--r-- | resolv/resolv.h | 273 |
31 files changed, 1150 insertions, 1010 deletions
@@ -1,3 +1,65 @@ +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. + 2000-07-18 Ulrich Drepper <drepper@redhat.com> * nss/makedb.c (main): Compare result of load_db with diff --git a/include/resolv.h b/include/resolv.h index 95b9eebef8..b416764bb6 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -1 +1,12 @@ +#ifndef _RESOLV_H_ + +#define RES_SET_H_ERRNO(r,x) \ + do \ + { \ + (r)->res_h_errno = x; \ + __set_h_errno(x); \ + } \ + while (0) + #include <resolv/resolv.h> +#endif diff --git a/linuxthreads/manager.c b/linuxthreads/manager.c index 76ef6cf9fb..1139e2eca7 100644 --- a/linuxthreads/manager.c +++ b/linuxthreads/manager.c @@ -462,7 +462,6 @@ static int pthread_handle_create(pthread_t *thread, const pthread_attr_t *attr, new_thread->p_canceltype = PTHREAD_CANCEL_DEFERRED; new_thread->p_errnop = &new_thread->p_errno; new_thread->p_h_errnop = &new_thread->p_h_errno; - new_thread->p_res._sock = -1; new_thread->p_resp = &new_thread->p_res; new_thread->p_guardaddr = guardaddr; new_thread->p_guardsize = guardsize; diff --git a/resolv/Banner b/resolv/Banner index d05a4e3ee7..e585ed8532 100644 --- a/resolv/Banner +++ b/resolv/Banner @@ -1 +1 @@ -BIND-8.2.2-5 +BIND-8.2.3-T5B diff --git a/resolv/Versions b/resolv/Versions index 98fa762a75..0f9255d08b 100644 --- a/resolv/Versions +++ b/resolv/Versions @@ -20,7 +20,7 @@ libc { } GLIBC_2.2 { # r* - __res_state; __res_ninit; + __res_state; __res_init; __res_nclose; __res_ninit; } } @@ -51,8 +51,11 @@ libresolv { __ns_name_unpack; __ns_name_ntop; } GLIBC_2.2 { - __res_nmkquery; __res_nquery; __res_nquerydomain; __res_nsearch; - __ns_get16; __res_hostalias; + __dn_expand; + __ns_get16; __ns_samename; + __res_hostalias; __res_mkquery; __res_nmkquery; __res_nquery; + __res_nquerydomain; __res_nsearch; __res_nsend; __res_query; + __res_querydomain; __res_search; } libnss_dns { diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index 6655f3b8d2..6ae1bc61ea 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -45,7 +45,7 @@ */ /* - * $Id$ + * $BINDId: nameser.h,v 8.37 2000/03/30 21:16:49 vixie Exp $ */ #ifndef _ARPA_NAMESER_H_ @@ -53,9 +53,13 @@ #define BIND_4_COMPAT -#include <features.h> #include <sys/param.h> -#include <sys/types.h> +#if (!defined(BSD)) || (BSD < 199306) +# include <sys/bitypes.h> +#else +# include <sys/types.h> +#endif +#include <sys/cdefs.h> /* * Revision information. This is the release date in YYYYMMDD format. @@ -481,6 +485,7 @@ typedef enum __ns_cert_types { #define ns_name_compress __ns_name_compress #define ns_name_uncompress __ns_name_uncompress #define ns_name_skip __ns_name_skip +#define ns_name_rollback __ns_name_rollback #define ns_sign __ns_sign #define ns_sign_tcp __ns_sign_tcp #define ns_sign_tcp_init __ns_sign_tcp_init @@ -522,6 +527,8 @@ int ns_name_uncompress __P((const u_char *, const u_char *, int ns_name_compress __P((const char *, u_char *, size_t, const u_char **, const u_char **)); int ns_name_skip __P((const u_char **, const u_char *)); +void ns_name_rollback __P((const u_char *, const u_char **, + const u_char **)); int ns_sign __P((u_char *, int *, int, int, void *, const u_char *, int, u_char *, int *, time_t)); int ns_sign_tcp __P((u_char *, int *, int, int, diff --git a/resolv/arpa/nameser_compat.h b/resolv/arpa/nameser_compat.h index f67f5b3a67..43bcd3affe 100644 --- a/resolv/arpa/nameser_compat.h +++ b/resolv/arpa/nameser_compat.h @@ -28,7 +28,7 @@ /* * from nameser.h 8.1 (Berkeley) 6/2/93 - * $Id$ + * $BINDId: nameser_compat.h,v 8.11 1999/01/02 08:00:58 vixie Exp $ */ #ifndef _ARPA_NAMESER_COMPAT_ @@ -36,7 +36,6 @@ #define __BIND 19950621 /* (DEAD) interface version stamp. */ -/* glibc always has byte order info in <endian.h> */ #include <endian.h> /* diff --git a/resolv/base64.c b/resolv/base64.c index 4e7e2a06d5..b7c7d1c1b8 100644 --- a/resolv/base64.c +++ b/resolv/base64.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996 by Internet Software Consortium. + * Copyright (c) 1996-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 @@ -40,9 +40,14 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ +#if !defined(LINT) && !defined(CODECENTER) +static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $"; +#endif /* not lint */ + #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> + #include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> @@ -50,13 +55,8 @@ #include <ctype.h> #include <resolv.h> #include <stdio.h> - -#if defined(BSD) && (BSD >= 199103) && defined(AF_INET6) -# include <stdlib.h> -# include <string.h> -#else -# include "../conf/portability.h" -#endif +#include <stdlib.h> +#include <string.h> #define Assert(Cond) if (!(Cond)) abort() @@ -112,9 +112,9 @@ static const char Pad64 = '='; end of the data is performed using the '=' character. Since all base64 input is an integral number of octets, only the - ------------------------------------------------- + ------------------------------------------------- following cases can arise: - + (1) the final quantum of encoding input is an integral multiple of 24 bits; here, the final unit of encoded output will be an integral multiple of 4 characters @@ -128,12 +128,7 @@ static const char Pad64 = '='; */ int -b64_ntop(src, srclength, target, targsize) - u_char const *src; - size_t srclength; - char *target; - size_t targsize; -{ +b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) { size_t datalength = 0; u_char input[3]; u_char output[4]; @@ -161,14 +156,14 @@ b64_ntop(src, srclength, target, targsize) target[datalength++] = Base64[output[2]]; target[datalength++] = Base64[output[3]]; } - + /* Now we worry about padding. */ if (0 != srclength) { /* Get what's left. */ input[0] = input[1] = input[2] = '\0'; for (i = 0; i < srclength; i++) input[i] = *src++; - + output[0] = input[0] >> 2; output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); @@ -204,8 +199,7 @@ b64_pton(src, target, targsize) u_char *target; size_t targsize; { - size_t tarindex; - int state, ch; + int tarindex, state, ch; char *pos; state = 0; @@ -225,7 +219,7 @@ b64_pton(src, target, targsize) switch (state) { case 0: if (target) { - if (tarindex >= targsize) + if ((size_t)tarindex >= targsize) return (-1); target[tarindex] = (pos - Base64) << 2; } @@ -233,7 +227,7 @@ b64_pton(src, target, targsize) break; case 1: if (target) { - if (tarindex + 1 >= targsize) + if ((size_t)tarindex + 1 >= targsize) return (-1); target[tarindex] |= (pos - Base64) >> 4; target[tarindex+1] = ((pos - Base64) & 0x0f) @@ -244,7 +238,7 @@ b64_pton(src, target, targsize) break; case 2: if (target) { - if (tarindex + 1 >= targsize) + if ((size_t)tarindex + 1 >= targsize) return (-1); target[tarindex] |= (pos - Base64) >> 2; target[tarindex+1] = ((pos - Base64) & 0x03) @@ -255,7 +249,7 @@ b64_pton(src, target, targsize) break; case 3: if (target) { - if (tarindex >= targsize) + if ((size_t)tarindex >= targsize) return (-1); target[tarindex] |= (pos - Base64); } @@ -281,12 +275,7 @@ b64_pton(src, target, targsize) case 2: /* Valid, means one byte of info */ /* Skip any number of spaces. */ -#ifdef _LIBC - /* To avoid warnings. */ - for ( ; ch != '\0'; ch = *src++) -#else - for (NULL; ch != '\0'; ch = *src++) -#endif + for ((void)NULL; ch != '\0'; ch = *src++) if (!isspace(ch)) break; /* Make sure there is another trailing = sign. */ @@ -301,12 +290,7 @@ b64_pton(src, target, targsize) * We know this char is an =. Is there anything but * whitespace after it? */ -#ifdef _LIBC - /* To avoid warnings. */ - for ( ; ch != '\0'; ch = *src++) -#else - for (NULL; ch != '\0'; ch = *src++) -#endif + for ((void)NULL; ch != '\0'; ch = *src++) if (!isspace(ch)) return (-1); diff --git a/resolv/herror.c b/resolv/herror.c index 8ba0ebef62..d53a0b5b0e 100644 --- a/resolv/herror.c +++ b/resolv/herror.c @@ -1,9 +1,7 @@ /* - * ++Copyright++ 1987, 1993 - * - * Copyright (c) 1987, 1993 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -15,7 +13,7 @@ * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -27,44 +25,43 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - - * Portions Copyright (c) 1993 by Digital Equipment Corporation. + */ + +/* + * Portions Copyright (c) 1996-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, and that - * the name of Digital Equipment Corporation not be used in advertising or - * publicity pertaining to distribution of the document or software without - * specific, written prior permission. + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT - * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * 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. - * - - * --Copyright-- */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id$"; +static const char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93"; +static const char rcsid[] = "$BINDId: herror.c,v 8.11 1999/10/13 16:39:39 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <sys/param.h> #include <sys/uio.h> + +#include <netinet/in.h> +#include <arpa/nameser.h> + #include <netdb.h> +#include <resolv.h> +#include <string.h> +#include <unistd.h> + #include <libintl.h> -#if defined(BSD) && (BSD >= 199103) -# include <unistd.h> -# include <string.h> -#else -# include "../conf/portability.h" -#endif const char *h_errlist[] = { N_("Resolver Error 0 (no error)"), @@ -75,23 +72,17 @@ const char *h_errlist[] = { }; int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] }; -#ifndef h_errno -extern int h_errno; -#endif - /* * herror -- * print the error indicated by the h_errno value. */ void -herror(s) - const char *s; -{ - struct iovec iov[4]; - register struct iovec *v = iov; +herror(const char *s) { + struct iovec iov[4], *v = iov; + extern int * __h_errno(); - if (s && *s) { - v->iov_base = (char *)s; + if (s != NULL && *s != '\0') { + v->iov_base = (/*noconst*/ char *)s; v->iov_len = strlen(s); v++; v->iov_base = ": "; @@ -106,10 +97,12 @@ herror(s) __writev(STDERR_FILENO, iov, (v - iov) + 1); } +/* + * hstrerror -- + * return the string associated with a given "host" errno value. + */ const char * -hstrerror(err) - int err; -{ +hstrerror(int err) { if (err < 0) return _("Resolver internal error"); else if (err < h_nerr) diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c index 48373b2060..59e160e435 100644 --- a/resolv/inet_addr.c +++ b/resolv/inet_addr.c @@ -1,9 +1,7 @@ /* - * ++Copyright++ 1983, 1990, 1993 - * - * Copyright (c) 1983, 1990, 1993 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -15,7 +13,7 @@ * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIM |