1999-12-04 18:05:55 +00:00
|
|
|
/*
|
2008-08-01 17:16:31 +00:00
|
|
|
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
|
1999-12-04 18:05:55 +00:00
|
|
|
* 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.
|
|
|
|
*
|
2008-08-01 17:16:31 +00:00
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
|
|
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC 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.
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
|
Update.
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-19 22:03:58 +00:00
|
|
|
#if !defined(_LIBC) && !defined(lint)
|
|
|
|
static const char rcsid[] = "$BINDId: ns_name.c,v 8.15 2000/03/30 22:53:46 vixie Exp $";
|
1999-12-04 18:05:55 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <arpa/nameser.h>
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <resolv.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
2008-08-01 17:16:31 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <limits.h>
|
|
|
|
|
|
|
|
# define SPRINTF(x) ((size_t)sprintf x)
|
|
|
|
|
|
|
|
#define NS_TYPE_ELT 0x40 /*%< EDNS0 extended label type */
|
|
|
|
#define DNS_LABELTYPE_BITSTRING 0x41
|
1999-12-04 18:05:55 +00:00
|
|
|
|
|
|
|
/* Data. */
|
|
|
|
|
|
|
|
static const char digits[] = "0123456789";
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
static const char digitvalue[256] = {
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*16*/
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*32*/
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*48*/
|
|
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /*64*/
|
|
|
|
-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*80*/
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*96*/
|
|
|
|
-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*112*/
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*128*/
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
|
|
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*256*/
|
|
|
|
};
|
|
|
|
|
1999-12-04 18:05:55 +00:00
|
|
|
/* Forward. */
|
|
|
|
|
|
|
|
static int special(int);
|
|
|
|
static int printable(int);
|
|
|
|
static int dn_find(const u_char *, const u_char *,
|
|
|
|
const u_char * const *,
|
|
|
|
const u_char * const *);
|
2008-08-01 17:16:31 +00:00
|
|
|
static int encode_bitstring(const char **, const char *,
|
|
|
|
unsigned char **, unsigned char **,
|
|
|
|
unsigned const char *);
|
|
|
|
static int labellen(const u_char *);
|
|
|
|
static int decode_bitstring(const unsigned char **,
|
|
|
|
char *, const char *);
|
1999-12-04 18:05:55 +00:00
|
|
|
|
|
|
|
/* Public. */
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Convert an encoded domain name to printable ascii as per RFC1035.
|
2008-08-01 17:16:31 +00:00
|
|
|
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li Number of bytes written to buffer, or -1 (with errno set)
|
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* notes:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li The root is returned as "."
|
|
|
|
*\li All other domains are returned in non absolute form
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
int
|
2008-08-01 17:16:31 +00:00
|
|
|
ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
|
|
|
|
{
|
1999-12-04 18:05:55 +00:00
|
|
|
const u_char *cp;
|
|
|
|
char *dn, *eom;
|
|
|
|
u_char c;
|
|
|
|
u_int n;
|
2008-08-01 17:16:31 +00:00
|
|
|
int l;
|
1999-12-04 18:05:55 +00:00
|
|
|
|
|
|
|
cp = src;
|
|
|
|
dn = dst;
|
|
|
|
eom = dst + dstsiz;
|
|
|
|
|
|
|
|
while ((n = *cp++) != 0) {
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
|
1999-12-04 18:05:55 +00:00
|
|
|
/* Some kind of compression pointer. */
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (dn != dst) {
|
|
|
|
if (dn >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*dn++ = '.';
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((l = labellen(cp - 1)) < 0) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
if (dn + l >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) {
|
|
|
|
int m;
|
2003-10-26 08:34:38 +00:00
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
if (n != DNS_LABELTYPE_BITSTRING) {
|
|
|
|
/* XXX: labellen should reject this case */
|
|
|
|
__set_errno (EINVAL);
|
|
|
|
return(-1);
|
2003-10-26 08:34:38 +00:00
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((m = decode_bitstring(&cp, dn, eom)) < 0)
|
|
|
|
{
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return(-1);
|
2003-10-26 08:34:38 +00:00
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
dn += m;
|
2003-10-26 08:34:38 +00:00
|
|
|
continue;
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
for ((void)NULL; l > 0; l--) {
|
1999-12-04 18:05:55 +00:00
|
|
|
c = *cp++;
|
|
|
|
if (special(c)) {
|
|
|
|
if (dn + 1 >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*dn++ = '\\';
|
|
|
|
*dn++ = (char)c;
|
|
|
|
} else if (!printable(c)) {
|
|
|
|
if (dn + 3 >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*dn++ = '\\';
|
|
|
|
*dn++ = digits[c / 100];
|
|
|
|
*dn++ = digits[(c % 100) / 10];
|
|
|
|
*dn++ = digits[c % 10];
|
|
|
|
} else {
|
|
|
|
if (dn >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*dn++ = (char)c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dn == dst) {
|
|
|
|
if (dn >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*dn++ = '.';
|
|
|
|
}
|
|
|
|
if (dn >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*dn++ = '\0';
|
|
|
|
return (dn - dst);
|
|
|
|
}
|
2004-10-18 05:10:37 +00:00
|
|
|
libresolv_hidden_def (ns_name_ntop)
|
2008-08-01 17:16:31 +00:00
|
|
|
strong_alias (ns_name_ntop, __ns_name_ntop)
|
1999-12-04 18:05:55 +00:00
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
2013-08-21 17:48:48 +00:00
|
|
|
* Convert an ascii string into an encoded domain name as per RFC1035.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
|
|
|
*\li -1 if it fails
|
|
|
|
*\li 1 if string was fully qualified
|
|
|
|
*\li 0 is string was not fully qualified
|
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* notes:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li Enforces label and domain length limits.
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2008-08-01 17:16:31 +00:00
|
|
|
ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
|
|
|
|
{
|
1999-12-04 18:05:55 +00:00
|
|
|
u_char *label, *bp, *eom;
|
2008-08-01 17:16:31 +00:00
|
|
|
int c, n, escaped, e = 0;
|
1999-12-04 18:05:55 +00:00
|
|
|
char *cp;
|
|
|
|
|
|
|
|
escaped = 0;
|
|
|
|
bp = dst;
|
|
|
|
eom = dst + dstsiz;
|
|
|
|
label = bp++;
|
|
|
|
|
|
|
|
while ((c = *src++) != 0) {
|
|
|
|
if (escaped) {
|
2008-08-01 17:16:31 +00:00
|
|
|
if (c == '[') { /*%< start a bit string label */
|
|
|
|
if ((cp = strchr(src, ']')) == NULL) {
|
|
|
|
__set_errno (EINVAL);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
if ((e = encode_bitstring(&src, cp + 2,
|
|
|
|
&label, &bp, eom))
|
|
|
|
!= 0) {
|
|
|
|
__set_errno (e);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
escaped = 0;
|
|
|
|
label = bp++;
|
|
|
|
if ((c = *src++) == 0)
|
|
|
|
goto done;
|
|
|
|
else if (c != '.') {
|
|
|
|
__set_errno (EINVAL);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if ((cp = strchr(digits, c)) != NULL) {
|
1999-12-04 18:05:55 +00:00
|
|
|
n = (cp - digits) * 100;
|
|
|
|
if ((c = *src++) == 0 ||
|
|
|
|
(cp = strchr(digits, c)) == NULL) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
n += (cp - digits) * 10;
|
|
|
|
if ((c = *src++) == 0 ||
|
|
|
|
(cp = strchr(digits, c)) == NULL) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
n += (cp - digits);
|
|
|
|
if (n > 255) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
c = n;
|
|
|
|
}
|
|
|
|
escaped = 0;
|
|
|
|
} else if (c == '\\') {
|
|
|
|
escaped = 1;
|
|
|
|
continue;
|
|
|
|
} else if (c == '.') {
|
|
|
|
c = (bp - label - 1);
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((c & NS_CMPRSFLGS) != 0) { /*%< Label too big. */
|
1999-12-04 18:05:55 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (label >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*label = c;
|
|
|
|
/* Fully qualified ? */
|
|
|
|
if (*src == '\0') {
|
|
|
|
if (c != 0) {
|
|
|
|
if (bp >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*bp++ = '\0';
|
|
|
|
}
|
|
|
|
if ((bp - dst) > MAXCDNAME) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
if (c == 0 || *src == '.') {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
label = bp++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (bp >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*bp++ = (u_char)c;
|
|
|
|
}
|
|
|
|
c = (bp - label - 1);
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((c & NS_CMPRSFLGS) != 0) { /*%< Label too big. */
|
1999-12-04 18:05:55 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
done:
|
1999-12-04 18:05:55 +00:00
|
|
|
if (label >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*label = c;
|
|
|
|
if (c != 0) {
|
|
|
|
if (bp >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*bp++ = 0;
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((bp - dst) > MAXCDNAME) { /*%< src too big */
|
1999-12-04 18:05:55 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
libresolv_hidden_def (ns_name_pton)
|
1999-12-04 18:05:55 +00:00
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Convert a network strings labels into all lowercase.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li Number of bytes written to buffer, or -1 (with errno set)
|
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* notes:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li Enforces label and domain length limits.
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2008-08-01 17:16:31 +00:00
|
|
|
ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz)
|
|
|
|
{
|
1999-12-04 18:05:55 +00:00
|
|
|
const u_char *cp;
|
|
|
|
u_char *dn, *eom;
|
|
|
|
u_char c;
|
|
|
|
u_int n;
|
2008-08-01 17:16:31 +00:00
|
|
|
int l;
|
1999-12-04 18:05:55 +00:00
|
|
|
|
|
|
|
cp = src;
|
|
|
|
dn = dst;
|
|
|
|
eom = dst + dstsiz;
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
if (dn >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
1999-12-04 18:05:55 +00:00
|
|
|
while ((n = *cp++) != 0) {
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
|
1999-12-04 18:05:55 +00:00
|
|
|
/* Some kind of compression pointer. */
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*dn++ = n;
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((l = labellen(cp - 1)) < 0) {
|
1999-12-04 18:05:55 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
if (dn + l >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
for ((void)NULL; l > 0; l--) {
|
1999-12-04 18:05:55 +00:00
|
|
|
c = *cp++;
|
|
|
|
if (isupper(c))
|
|
|
|
*dn++ = tolower(c);
|
|
|
|
else
|
|
|
|
*dn++ = c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*dn++ = '\0';
|
|
|
|
return (dn - dst);
|
|
|
|
}
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Unpack a domain name from a message, source may be compressed.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li -1 if it fails, or consumed octets if it succeeds.
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
|
|
|
|
u_char *dst, size_t dstsiz)
|
|
|
|
{
|
|
|
|
const u_char *srcp, *dstlim;
|
|
|
|
u_char *dstp;
|
2008-08-01 17:16:31 +00:00
|
|
|
int n, len, checked, l;
|
1999-12-04 18:05:55 +00:00
|
|
|
|
|
|
|
len = -1;
|
|
|
|
checked = 0;
|
|
|
|
dstp = dst;
|
|
|
|
srcp = src;
|
|
|
|
dstlim = dst + dstsiz;
|
|
|
|
if (srcp < msg || srcp >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
/* Fetch next label in domain name. */
|
|
|
|
while ((n = *srcp++) != 0) {
|
|
|
|
/* Check for indirection. */
|
|
|
|
switch (n & NS_CMPRSFLGS) {
|
|
|
|
case 0:
|
2008-08-01 17:16:31 +00:00
|
|
|
case NS_TYPE_ELT:
|
1999-12-04 18:05:55 +00:00
|
|
|
/* Limit checks. */
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((l = labellen(srcp - 1)) < 0) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
if (dstp + l + 1 >= dstlim || srcp + l >= eom) {
|
1999-12-04 18:05:55 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
checked += l + 1;
|
|
|
|
*dstp++ = n;
|
|
|
|
memcpy(dstp, srcp, l);
|
|
|
|
dstp += l;
|
|
|
|
srcp += l;
|
1999-12-04 18:05:55 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case NS_CMPRSFLGS:
|
|
|
|
if (srcp >= eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (len < 0)
|
|
|
|
len = srcp - src + 1;
|
|
|
|
srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
|
2008-08-01 17:16:31 +00:00
|
|
|
if (srcp < msg || srcp >= eom) { /*%< Out of range. */
|
1999-12-04 18:05:55 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
checked += 2;
|
|
|
|
/*
|
|
|
|
* Check for loops in the compressed name;
|
|
|
|
* if we've looked at the whole message,
|
|
|
|
* there must be a loop.
|
|
|
|
*/
|
|
|
|
if (checked >= eom - msg) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
__set_errno (EMSGSIZE);
|
2008-08-01 17:16:31 +00:00
|
|
|
return (-1); /*%< flag error */
|
1999-12-04 18:05:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
*dstp = '\0';
|
|
|
|
if (len < 0)
|
|
|
|
len = srcp - src;
|
|
|
|
return (len);
|
|
|
|
}
|
2004-10-18 05:10:37 +00:00
|
|
|
libresolv_hidden_def (ns_name_unpack)
|
2008-08-01 17:16:31 +00:00
|
|
|
strong_alias (ns_name_unpack, __ns_name_unpack)
|
1999-12-04 18:05:55 +00:00
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Pack domain name 'domain' into 'comp_dn'.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li Size of the compressed name, or -1.
|
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* notes:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li 'dnptrs' is an array of pointers to previous compressed names.
|
|
|
|
*\li dnptrs[0] is a pointer to the beginning of the message. The array
|
1999-12-04 18:05:55 +00:00
|
|
|
* ends with NULL.
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li 'lastdnptr' is a pointer to the end of the array pointed to
|
1999-12-04 18:05:55 +00:00
|
|
|
* by 'dnptrs'.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* Side effects:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li The list of pointers in dnptrs is updated for labels inserted into
|
1999-12-04 18:05:55 +00:00
|
|
|
* the message as we compress the name. If 'dnptr' is NULL, we don't
|
|
|
|
* try to compress names. If 'lastdnptr' is NULL, we don't update the
|
|
|
|
* list.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
|
|
|
|
const u_char **dnptrs, const u_char **lastdnptr)
|
|
|
|
{
|
|
|
|
u_char *dstp;
|
|
|
|
const u_char **cpp, **lpp, *eob, *msg;
|
|
|
|
const u_char *srcp;
|
Update.
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-19 22:03:58 +00:00
|
|
|
int n, l, first = 1;
|
1999-12-04 18:05:55 +00:00
|
|
|
|
|
|
|
srcp = src;
|
|
|
|
dstp = dst;
|
|
|
|
eob = dstp + dstsiz;
|
|
|
|
lpp = cpp = NULL;
|
|
|
|
if (dnptrs != NULL) {
|
|
|
|
if ((msg = *dnptrs++) != NULL) {
|
|
|
|
for (cpp = dnptrs; *cpp != NULL; cpp++)
|
|
|
|
(void)NULL;
|
2008-08-01 17:16:31 +00:00
|
|
|
lpp = cpp; /*%< end of list to search */
|
1999-12-04 18:05:55 +00:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
msg = NULL;
|
|
|
|
|
|
|
|
/* make sure the domain we are about to add is legal */
|
|
|
|
l = 0;
|
|
|
|
do {
|
2008-08-01 17:16:31 +00:00
|
|
|
int l0;
|
|
|
|
|
1999-12-04 18:05:55 +00:00
|
|
|
n = *srcp;
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
|
1999-12-04 18:05:55 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((l0 = labellen(srcp)) < 0) {
|
|
|
|
__set_errno (EINVAL);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
l += l0 + 1;
|
1999-12-04 18:05:55 +00:00
|
|
|
if (l > MAXCDNAME) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
srcp += l0 + 1;
|
1999-12-04 18:05:55 +00:00
|
|
|
} while (n != 0);
|
|
|
|
|
|
|
|
/* from here on we need to reset compression pointer array on error */
|
|
|
|
srcp = src;
|
|
|
|
do {
|
|
|
|
/* Look to see if we can use pointers. */
|
|
|
|
n = *srcp;
|
2008-08-01 17:16:31 +00:00
|
|
|
if (n != 0 && msg != NULL) {
|
1999-12-04 18:05:55 +00:00
|
|
|
l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
|
|
|
|
(const u_char * const *)lpp);
|
|
|
|
if (l >= 0) {
|
|
|
|
if (dstp + 1 >= eob) {
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
*dstp++ = (l >> 8) | NS_CMPRSFLGS;
|
|
|
|
*dstp++ = l % 256;
|
|
|
|
return (dstp - dst);
|
|
|
|
}
|
|
|
|
/* Not found, save it. */
|
|
|
|
if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
|
Update.
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-19 22:03:58 +00:00
|
|
|
(dstp - msg) < 0x4000 && first) {
|
1999-12-04 18:05:55 +00:00
|
|
|
*cpp++ = dstp;
|
|
|
|
*cpp = NULL;
|
Update.
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-19 22:03:58 +00:00
|
|
|
first = 0;
|
1999-12-04 18:05:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* copy label to buffer */
|
2008-08-01 17:16:31 +00:00
|
|
|
if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
|
|
|
|
/* Should not happen. */
|
1999-12-04 18:05:55 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
n = labellen(srcp);
|
1999-12-04 18:05:55 +00:00
|
|
|
if (dstp + 1 + n >= eob) {
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
memcpy(dstp, srcp, n + 1);
|
|
|
|
srcp += n + 1;
|
|
|
|
dstp += n + 1;
|
|
|
|
} while (n != 0);
|
|
|
|
|
|
|
|
if (dstp > eob) {
|
|
|
|
cleanup:
|
|
|
|
if (msg != NULL)
|
|
|
|
*lpp = NULL;
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
2003-10-26 08:34:38 +00:00
|
|
|
}
|
1999-12-04 18:05:55 +00:00
|
|
|
return (dstp - dst);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
libresolv_hidden_def (ns_name_pack)
|
1999-12-04 18:05:55 +00:00
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Expand compressed domain name to presentation format.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li Number of bytes read out of `src', or -1 (with errno set).
|
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* note:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li Root domain returns as "." not "".
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
|
|
|
|
char *dst, size_t dstsiz)
|
|
|
|
{
|
|
|
|
u_char tmp[NS_MAXCDNAME];
|
|
|
|
int n;
|
2003-10-26 08:34:38 +00:00
|
|
|
|
1999-12-04 18:05:55 +00:00
|
|
|
if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
|
|
|
|
return (-1);
|
|
|
|
if (ns_name_ntop(tmp, dst, dstsiz) == -1)
|
|
|
|
return (-1);
|
|
|
|
return (n);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
libresolv_hidden_def (ns_name_uncompress)
|
1999-12-04 18:05:55 +00:00
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Compress a domain name into wire format, using compression pointers.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li Number of bytes consumed in `dst' or -1 (with errno set).
|
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* notes:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li 'dnptrs' is an array of pointers to previous compressed names.
|
|
|
|
*\li dnptrs[0] is a pointer to the beginning of the message.
|
|
|
|
*\li The list ends with NULL. 'lastdnptr' is a pointer to the end of the
|
1999-12-04 18:05:55 +00:00
|
|
|
* array pointed to by 'dnptrs'. Side effect is to update the list of
|
|
|
|
* pointers for labels inserted into the message as we compress the name.
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
|
1999-12-04 18:05:55 +00:00
|
|
|
* is NULL, we don't update the list.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
|
|
|
|
const u_char **dnptrs, const u_char **lastdnptr)
|
|
|
|
{
|
|
|
|
u_char tmp[NS_MAXCDNAME];
|
|
|
|
|
|
|
|
if (ns_name_pton(src, tmp, sizeof tmp) == -1)
|
|
|
|
return (-1);
|
|
|
|
return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
libresolv_hidden_def (ns_name_compress)
|
1999-12-04 18:05:55 +00:00
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
Update.
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-19 22:03:58 +00:00
|
|
|
* Reset dnptrs so that there are no active references to pointers at or
|
|
|
|
* after src.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
ns_name_rollback(const u_char *src, const u_char **dnptrs,
|
|
|
|
const u_char **lastdnptr)
|
|
|
|
{
|
|
|
|
while (dnptrs < lastdnptr && *dnptrs != NULL) {
|
|
|
|
if (*dnptrs >= src) {
|
|
|
|
*dnptrs = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
dnptrs++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Advance *ptrptr to skip over the compressed name it points at.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li 0 on success, -1 (with errno set) on failure.
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
int
|
2008-08-01 17:16:31 +00:00
|
|
|
ns_name_skip(const u_char **ptrptr, const u_char *eom)
|
|
|
|
{
|
1999-12-04 18:05:55 +00:00
|
|
|
const u_char *cp;
|
|
|
|
u_int n;
|
2008-08-01 17:16:31 +00:00
|
|
|
int l;
|
1999-12-04 18:05:55 +00:00
|
|
|
|
|
|
|
cp = *ptrptr;
|
|
|
|
while (cp < eom && (n = *cp++) != 0) {
|
|
|
|
/* Check for indirection. */
|
|
|
|
switch (n & NS_CMPRSFLGS) {
|
2008-08-01 17:16:31 +00:00
|
|
|
case 0: /*%< normal case, n == len */
|
1999-12-04 18:05:55 +00:00
|
|
|
cp += n;
|
|
|
|
continue;
|
2008-08-01 17:16:31 +00:00
|
|
|
case NS_TYPE_ELT: /*%< EDNS0 extended label */
|
|
|
|
if ((l = labellen(cp - 1)) < 0) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
cp += l;
|
|
|
|
continue;
|
|
|
|
case NS_CMPRSFLGS: /*%< indirection */
|
1999-12-04 18:05:55 +00:00
|
|
|
cp++;
|
|
|
|
break;
|
2008-08-01 17:16:31 +00:00
|
|
|
default: /*%< illegal type */
|
1999-12-04 18:05:55 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (cp > eom) {
|
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
*ptrptr = cp;
|
|
|
|
return (0);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
libresolv_hidden_def (ns_name_skip)
|
1999-12-04 18:05:55 +00:00
|
|
|
|
|
|
|
/* Private. */
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Thinking in noninternationalized USASCII (per the DNS spec),
|
2013-08-30 12:32:07 +00:00
|
|
|
* is this character special ("in need of quoting") ?
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li boolean.
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
special(int ch) {
|
|
|
|
switch (ch) {
|
2008-08-01 17:16:31 +00:00
|
|
|
case 0x22: /*%< '"' */
|
|
|
|
case 0x2E: /*%< '.' */
|
|
|
|
case 0x3B: /*%< ';' */
|
|
|
|
case 0x5C: /*%< '\\' */
|
|
|
|
case 0x28: /*%< '(' */
|
|
|
|
case 0x29: /*%< ')' */
|
1999-12-04 18:05:55 +00:00
|
|
|
/* Special modifiers in zone files. */
|
2008-08-01 17:16:31 +00:00
|
|
|
case 0x40: /*%< '@' */
|
|
|
|
case 0x24: /*%< '$' */
|
1999-12-04 18:05:55 +00:00
|
|
|
return (1);
|
|
|
|
default:
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Thinking in noninternationalized USASCII (per the DNS spec),
|
|
|
|
* is this character visible and not a space when printed ?
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li boolean.
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
printable(int ch) {
|
|
|
|
return (ch > 0x20 && ch < 0x7f);
|
|
|
|
}
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Thinking in noninternationalized USASCII (per the DNS spec),
|
|
|
|
* convert this character to lower case if it's upper case.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
mklower(int ch) {
|
|
|
|
if (ch >= 0x41 && ch <= 0x5A)
|
|
|
|
return (ch + 0x20);
|
|
|
|
return (ch);
|
|
|
|
}
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
/*%
|
1999-12-04 18:05:55 +00:00
|
|
|
* Search for the counted-label name in an array of compressed names.
|
2008-08-01 17:16:31 +00:00
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* return:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li offset from msg if found, or -1.
|
|
|
|
*
|
1999-12-04 18:05:55 +00:00
|
|
|
* notes:
|
2008-08-01 17:16:31 +00:00
|
|
|
*\li dnptrs is the pointer to the first name on the list,
|
|
|
|
*\li not the pointer to the start of the message.
|
1999-12-04 18:05:55 +00:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
dn_find(const u_char *domain, const u_char *msg,
|
|
|
|
const u_char * const *dnptrs,
|
|
|
|
const u_char * const *lastdnptr)
|
|
|
|
{
|
|
|
|
const u_char *dn, *cp, *sp;
|
|
|
|
const u_char * const *cpp;
|
|
|
|
u_int n;
|
|
|
|
|
|
|
|
for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
|
Update.
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-19 22:03:58 +00:00
|
|
|
sp = *cpp;
|
|
|
|
/*
|
|
|
|
* terminate search on:
|
|
|
|
* root label
|
|
|
|
* compression pointer
|
|
|
|
* unusable offset
|
|
|
|
*/
|
|
|
|
while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 &&
|
|
|
|
(sp - msg) < 0x4000) {
|
|
|
|
dn = domain;
|
|
|
|
cp = sp;
|
|
|
|
while ((n = *cp++) != 0) {
|
|
|
|
/*
|
|
|
|
* check for indirection
|
|
|
|
*/
|
|
|
|
switch (n & NS_CMPRSFLGS) {
|
2008-08-01 17:16:31 +00:00
|
|
|
case 0: /*%< normal case, n == len */
|
|
|
|
n = labellen(cp - 1); /*%< XXX */
|
Update.
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-19 22:03:58 +00:00
|
|
|
if (n != *dn++)
|
1999-12-04 18:05:55 +00:00
|
|
|
goto next;
|
2008-08-01 17:16:31 +00:00
|
|
|
|
Update.
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-19 22:03:58 +00:00
|
|
|
for ((void)NULL; n > 0; n--)
|
|
|
|
if (mklower(*dn++) !=
|
|
|
|
mklower(*cp++))
|
|
|
|
goto next;
|
|
|
|
/* Is next root for both ? */
|
|
|
|
if (*dn == '\0' && *cp == '\0')
|
|
|
|
return (sp - msg);
|
|
|
|
if (*dn)
|
|
|
|
continue;
|
|
|
|
goto next;
|
2008-08-01 17:16:31 +00:00
|
|
|
case NS_CMPRSFLGS: /*%< indirection */
|
Update.
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-19 22:03:58 +00:00
|
|
|
cp = msg + (((n & 0x3f) << 8) | *cp);
|
|
|
|
break;
|
|
|
|
|
2008-08-01 17:16:31 +00:00
|
|
|
default: /*%< illegal type */
|
Update.
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-19 22:03:58 +00:00
|
|
|
__set_errno (EMSGSIZE);
|
|
|
|
return (-1);
|
|
|
|
}
|
1999-12-04 18:05:55 +00:00
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
next: ;
|
Update.
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-19 22:03:58 +00:00
|
|
|
sp += *sp + 1;
|
1999-12-04 18:05:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
__set_errno (ENOENT);
|
|
|
|
return (-1);
|
|
|
|
}
|
2008-08-01 17:16:31 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
|
|
|
|
{
|
|
|
|
const unsigned char *cp = *cpp;
|
|
|
|
char *beg = dn, tc;
|
|
|
|
int b, blen, plen, i;
|
|
|
|
|
|
|
|
if ((blen = (*cp & 0xff)) == 0)
|
|
|
|
blen = 256;
|
|
|
|
plen = (blen + 3) / 4;
|
|
|
|
plen += sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1);
|
|
|
|
if (dn + plen >= eom)
|
|
|
|
return(-1);
|
|
|
|
|
|
|
|
cp++;
|
|
|
|
i = SPRINTF((dn, "\\[x"));
|
|
|
|
if (i < 0)
|
|
|
|
return (-1);
|
|
|
|
dn += i;
|
|
|
|
for (b = blen; b > 7; b -= 8, cp++) {
|
|
|
|
i = SPRINTF((dn, "%02x", *cp & 0xff));
|
|
|
|
if (i < 0)
|
|
|
|
return (-1);
|
|
|
|
dn += i;
|
|
|
|
}
|
|
|
|
if (b > 4) {
|
|
|
|
tc = *cp++;
|
|
|
|
i = SPRINTF((dn, "%02x", tc & (0xff << (8 - b))));
|
|
|
|
if (i < 0)
|
|
|
|
return (-1);
|
|
|
|
dn += i;
|
|
|
|
} else if (b > 0) {
|
|
|
|
tc = *cp++;
|
|
|
|
i = SPRINTF((dn, "%1x",
|
|
|
|
((tc >> 4) & 0x0f) & (0x0f << (4 - b))));
|
|
|
|
if (i < 0)
|
|
|
|
return (-1);
|
|
|
|
dn += i;
|
|
|
|
}
|
|
|
|
i = SPRINTF((dn, "/%d]", blen));
|
|
|
|
if (i < 0)
|
|
|
|
return (-1);
|
|
|
|
dn += i;
|
|
|
|
|
|
|
|
*cpp = cp;
|
|
|
|
return(dn - beg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
encode_bitstring(const char **bp, const char *end, unsigned char **labelp,
|
|
|
|
unsigned char ** dst, unsigned const char *eom)
|
|
|
|
{
|
|
|
|
int afterslash = 0;
|
|
|
|
const char *cp = *bp;
|
|
|
|
unsigned char *tp;
|
|
|
|
char c;
|
|
|
|
const char *beg_blen;
|
|
|
|
char *end_blen = NULL;
|
|
|
|
int value = 0, count = 0, tbcount = 0, blen = 0;
|
|
|
|
|
|
|
|
beg_blen = end_blen = NULL;
|
|
|
|
|
|
|
|
/* a bitstring must contain at least 2 characters */
|
|
|
|
if (end - cp < 2)
|
|
|
|
return(EINVAL);
|
|
|
|
|
|
|
|
/* XXX: currently, only hex strings are supported */
|
|
|
|
if (*cp++ != 'x')
|
|
|
|
return(EINVAL);
|
|
|
|
if (!isxdigit((*cp) & 0xff)) /*%< reject '\[x/BLEN]' */
|
|
|
|
return(EINVAL);
|
|
|
|
|
|
|
|
for (tp = *dst + 1; cp < end && tp < eom; cp++) {
|
|
|
|
switch((c = *cp)) {
|
|
|
|
case ']': /*%< end of the bitstring */
|
|
|
|
if (afterslash) {
|
|
|
|
if (beg_blen == NULL)
|
|
|
|
return(EINVAL);
|
|
|
|
blen = (int)strtol(beg_blen, &end_blen, 10);
|
|
|
|
if (*end_blen != ']')
|
|
|
|
return(EINVAL);
|
|
|
|
}
|
|
|
|
if (count)
|
|
|
|
*tp++ = ((value << 4) & 0xff);
|
|
|
|
cp++; /*%< skip ']' */
|
|
|
|
goto done;
|
|
|
|
case '/':
|
|
|
|
afterslash = 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (afterslash) {
|
|
|
|
if (!isdigit(c&0xff))
|
|
|
|
return(EINVAL);
|
|
|
|
if (beg_blen == NULL) {
|
|
|
|
|
|
|
|
if (c == '0') {
|
|
|
|
/* blen never begings with 0 */
|
|
|
|
return(EINVAL);
|
|
|
|
}
|
|
|
|
beg_blen = cp;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (!isxdigit(c&0xff))
|
|
|
|
return(EINVAL);
|
|
|
|
value <<= 4;
|
|
|
|
value += digitvalue[(int)c];
|
|
|
|
count += 4;
|
|
|
|
tbcount += 4;
|
|
|
|
if (tbcount > 256)
|
|
|
|
return(EINVAL);
|
|
|
|
if (count == 8) {
|
|
|
|
*tp++ = value;
|
|
|
|
count = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
done:
|
|
|
|
if (cp >= end || tp >= eom)
|
|
|
|
return(EMSGSIZE);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* bit length validation:
|
|
|
|
* If a <length> is present, the number of digits in the <bit-data>
|
|
|
|
* MUST be just sufficient to contain the number of bits specified
|
|
|
|
* by the <length>. If there are insignificant bits in a final
|
|
|
|
* hexadecimal or octal digit, they MUST be zero.
|
|
|
|
* RFC2673, Section 3.2.
|
|
|
|
*/
|
|
|
|
if (blen > 0) {
|
|
|
|
int traillen;
|
|
|
|
|
|
|
|
if (((blen + 3) & ~3) != tbcount)
|
|
|
|
return(EINVAL);
|
|
|
|
traillen = tbcount - blen; /*%< between 0 and 3 */
|
|
|
|
if (((value << (8 - traillen)) & 0xff) != 0)
|
|
|
|
return(EINVAL);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
blen = tbcount;
|
|
|
|
if (blen == 256)
|
|
|
|
blen = 0;
|
|
|
|
|
|
|
|
/* encode the type and the significant bit fields */
|
|
|
|
**labelp = DNS_LABELTYPE_BITSTRING;
|
|
|
|
**dst = blen;
|
|
|
|
|
|
|
|
*bp = cp;
|
|
|
|
*dst = tp;
|
|
|
|
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
labellen(const u_char *lp)
|
|
|
|
{
|
|
|
|
int bitlen;
|
|
|
|
u_char l = *lp;
|
|
|
|
|
|
|
|
if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
|
|
|
|
/* should be avoided by the caller */
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) {
|
|
|
|
if (l == DNS_LABELTYPE_BITSTRING) {
|
|
|
|
if ((bitlen = *(lp + 1)) == 0)
|
|
|
|
bitlen = 256;
|
|
|
|
return((bitlen + 7 ) / 8 + 1);
|
|
|
|
}
|
|
|
|
return(-1); /*%< unknwon ELT */
|
|
|
|
}
|
|
|
|
return(l);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \file */
|