summaryrefslogtreecommitdiff
path: root/resolv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-02-07 00:06:12 +0000
committerUlrich Drepper <drepper@redhat.com>1999-02-07 00:06:12 +0000
commit8d8c6efa78d0eb67138bddf96415c2b80a4c820c (patch)
tree9ffb99e37931add0899606dc03b233a2e1e3f933 /resolv
parentb8f558b7ace3a2e5e3234ac24a600cbe230da8d1 (diff)
downloadglibc-8d8c6efa78d0eb67138bddf96415c2b80a4c820c.tar.gz
Update.
1999-02-06 Ulrich Drepper <drepper@cygnus.com> * Versions.def: Add versions for ld.so. * csu/Versions: Remove __libc_stack_end here. * elf/Versions: Split libc definitions in libc and ld.so definitions. * elf/Makefile (ld-map): Change to ld.so.map. * scripts/versions.awk: Recognize dot in library names. * ctype/ctype.h: Remove definitions of __tolower and __toupper. Don't use __tolower and __toupper in inline functions. Add optimizing macros for tolower and toupper. * ctype/ctype-extn.c (_tolower): Don't use __tolower. (_toupper): Don't use __toupper. * ctype/ctype.c (tolower): Don't use __tolower. (toupper): Don't use toupper. * nscd/cache.c (prune_cache): Correct printing of debugging messages. * resolv/Versions (libresolv): Export __ns_name_unpack and __ns_name_ntop. * resolv/res_comp.c: Rename ns_name_unpack to __ns_name_unpack and make it global. Change all users. Similar for ns_name_ntop. * resolv/nss_dns/dns-host.c: Don't use dn_expand when extracting in user-provided buffer. Use __ns_name_unpack and __ns_name_ntop directly to detect too small buffer. * stdio-common/Makefile (tests): Add scanf12. * stdio-common/scanf12.c: New file. * stdio-common/scanf12.input: New file. * stdio-common/vfscanf.c (__vfscanf): Handle +/- at beginning of floating-point correctly if the number is invalid. * stdio-common/vfscanf.c: Don't use non-reentrant multibyte conversion * stdio-common/printf_fphex.c: Likewise. * stdio-common/vfprintf.c: Likewise. See ChangeLog.9 for earlier changes.
Diffstat (limited to 'resolv')
-rw-r--r--resolv/Versions4
-rw-r--r--resolv/nss_dns/dns-host.c92
-rw-r--r--resolv/nss_dns/dns-network.c39
-rw-r--r--resolv/res_comp.c22
4 files changed, 121 insertions, 36 deletions
diff --git a/resolv/Versions b/resolv/Versions
index 112f55a19e..9bf6a39b6a 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -42,6 +42,10 @@ libresolv {
__res_send;
__sym_ntop; __sym_ntos; __sym_ston;
}
+ GLIBC_2.1 {
+ # Needed in libnss_dns.
+ __ns_name_unpack; __ns_name_ntop;
+ }
}
libnss_dns {
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 4d46384ca7..078d452fd6 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -116,6 +116,12 @@ typedef union querybuf
u_char buf[MAXPACKET];
} querybuf;
+/* These functions are defined in res_comp.c. */
+#define NS_MAXCDNAME 255 /* maximum compressed domain name */
+extern int __ns_name_ntop __P ((const u_char *, char *, size_t));
+extern int __ns_name_unpack __P ((const u_char *, const u_char *,
+ const u_char *, u_char *, size_t));
+
static enum nss_status getanswer_r (const querybuf *answer, int anslen,
const char *qname, int qtype,
@@ -315,6 +321,7 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
char tbuf[MAXDNAME];
const char *tname;
int (*name_ok) __P ((const char *));
+ u_char packtmp[NS_MAXCDNAME];
tname = qname;
result->h_name = NULL;
@@ -346,20 +353,27 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
return NSS_STATUS_UNAVAIL;
}
- n = dn_expand (answer->buf, end_of_message, cp, bp, linebuflen);
- if (n < 0 || (*name_ok) (bp) == 0)
+ n = __ns_name_unpack (answer->buf, end_of_message, cp,
+ packtmp, sizeof packtmp);
+ if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
{
if (errno == EMSGSIZE)
{
- /* There is not enough room in the input buffer. */
*errnop = ERANGE;
*h_errnop = NETDB_INTERNAL;
+ return NSS_STATUS_TRYAGAIN;
}
- else
- {
- *errnop = errno;
- *h_errnop = NO_RECOVERY;
- }
+
+ n = -1;
+ }
+
+ if (n > 0 && bp[0] == '.')
+ bp[0] = '\0';
+
+ if (n < 0 || (*name_ok) (bp) == 0)
+ {
+ *errnop = errno;
+ *h_errnop = NO_RECOVERY;
return NSS_STATUS_UNAVAIL;
}
cp += n + QFIXEDSZ;
@@ -396,7 +410,20 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
{
int type, class;
- n = dn_expand (answer->buf, end_of_message, cp, bp, linebuflen);
+ n = __ns_name_unpack (answer->buf, end_of_message, cp,
+ packtmp, sizeof packtmp);
+ if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
+ {
+ if (errno == EMSGSIZE)
+ {
+ *errnop = ERANGE;
+ *h_errnop = NETDB_INTERNAL;
+ return NSS_STATUS_TRYAGAIN;
+ }
+
+ n = -1;
+ }
+
if (n < 0 || (*name_ok) (bp) == 0)
{
++had_error;
@@ -405,9 +432,9 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
cp += n; /* name */
type = _getshort (cp);
cp += INT16SZ; /* type */
- class = _getshort(cp);
+ class = _getshort (cp);
cp += INT16SZ + INT32SZ; /* class, TTL */
- n = _getshort(cp);
+ n = _getshort (cp);
cp += INT16SZ; /* len */
if (class != C_IN)
{
@@ -444,8 +471,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
++had_error;
continue;
}
- result->h_name = strcpy (bp, tbuf); /* Cannot overflow. */
- bp += n;
+ result->h_name = bp;
+ bp = __mempcpy (bp, tbuf, n); /* Cannot overflow. */
linebuflen -= n;
continue;
}
@@ -466,8 +493,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
++had_error;
continue;
}
- tname = strcpy (bp, tbuf); /* Cannot overflow. */
- bp += n;
+ tname = bp;
+ bp = __mempcpy (bp, tbuf, n); /* Cannot overflow. */
linebuflen -= n;
continue;
}
@@ -493,13 +520,27 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
switch (type)
{
case T_PTR:
- if (strcasecmp (tname, bp) != 0)
+ if (__strcasecmp (tname, bp) != 0)
{
syslog (LOG_NOTICE | LOG_AUTH, AskedForGot, qname, bp);
cp += n;
continue; /* XXX - had_error++ ? */
}
- n = dn_expand (answer->buf, end_of_message, cp, bp, linebuflen);
+
+ n = __ns_name_unpack (answer->buf, end_of_message, cp,
+ packtmp, sizeof packtmp);
+ if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
+ {
+ if (errno == EMSGSIZE)
+ {
+ *errnop = ERANGE;
+ *h_errnop = NETDB_INTERNAL;
+ return NSS_STATUS_TRYAGAIN;
+ }
+
+ n = -1;
+ }
+
if (n < 0 || res_hnok (bp) == 0)
{
++had_error;
@@ -577,8 +618,7 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
cp += n;
continue;
}
- memcpy (*hap++ = bp, cp, n);
- bp += n;
+ bp = __mempcpy (*hap++ = bp, cp, n);
cp += n;
linebuflen -= n;
break;
@@ -606,10 +646,16 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
if (result->h_name == NULL)
{
n = strlen (qname) + 1; /* For the \0. */
- if (n > linebuflen || n >= MAXHOSTNAMELEN)
+ if (n > linebuflen)
+ {
+ *errnop = ERANGE;
+ *h_errnop = NETDB_INTERNAL;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ if (n >= MAXHOSTNAMELEN)
goto no_recovery;
- result->h_name = strcpy (bp, qname); /* Cannot overflow. */
- bp += n;
+ result->h_name = bp;
+ bp = __mempcpy (bp, qname, n); /* Cannot overflow. */
linebuflen -= n;
}
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 6faeec33e4..c8fee78bbe 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -95,6 +95,12 @@ typedef union querybuf
u_char buf[MAXPACKET];
} querybuf;
+/* These functions are defined in res_comp.c. */
+#define NS_MAXCDNAME 255 /* maximum compressed domain name */
+extern int __ns_name_ntop __P ((const u_char *, char *, size_t));
+extern int __ns_name_unpack __P ((const u_char *, const u_char *,
+ const u_char *, u_char *, size_t));
+
/* Prototypes for local functions. */
static enum nss_status getanswer_r (const querybuf *answer, int anslen,
@@ -235,6 +241,7 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
char **alias_pointer;
int have_answer;
char *ans;
+ u_char packtmp[NS_MAXCDNAME];
if (question_count == 0)
{
@@ -267,6 +274,22 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
int n = dn_expand (answer->buf, end_of_message, cp, bp, linebuflen);
int type, class;
+ n = __ns_name_unpack (answer->buf, end_of_message, cp,
+ packtmp, sizeof packtmp);
+ if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
+ {
+ if (errno == EMSGSIZE)
+ {
+ errno = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
+
+ n = -1;
+ }
+
+ if (n > 0 && bp[0] == '.')
+ bp[0] = '\0';
+
if (n < 0 || res_dnok (bp) == 0)
break;
cp += n;
@@ -278,7 +301,19 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
if (class == C_IN && type == T_PTR)
{
- n = dn_expand (answer->buf, end_of_message, cp, bp, linebuflen);
+ n = __ns_name_unpack (answer->buf, end_of_message, cp,
+ packtmp, sizeof packtmp);
+ if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
+ {
+ if (errno == EMSGSIZE)
+ {
+ errno = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
+
+ n = -1;
+ }
+
if (n < 0 || !res_hnok (bp))
{
/* XXX What does this mean? The original form from bind
diff --git a/resolv/res_comp.c b/resolv/res_comp.c
index 2661963632..bc3b245351 100644
--- a/resolv/res_comp.c
+++ b/resolv/res_comp.c
@@ -75,10 +75,10 @@ static char rcsid[] = "$Id$";
# include "../conf/portability.h"
#endif
-static int ns_name_ntop __P((const u_char *, char *, size_t));
+extern int __ns_name_ntop __P((const u_char *, char *, size_t));
static int ns_name_pton __P((const char *, u_char *, size_t));
-static int ns_name_unpack __P((const u_char *, const u_char *,
- const u_char *, u_char *, size_t));
+extern int __ns_name_unpack __P((const u_char *, const u_char *,
+ const u_char *, u_char *, size_t));
static int ns_name_pack __P((const u_char *, u_char *, int,
const u_char **, const u_char **));
static int ns_name_uncompress __P((const u_char *, const u_char *,
@@ -349,7 +349,7 @@ __putlong(l, msgp)
/* Data. */
-static char digits[] = "0123456789";
+static const char digits[] = "0123456789";
/* Forward. */
@@ -370,8 +370,8 @@ static int dn_find(const u_char *, const u_char *,
* The root is returned as "."
* All other domains are returned in non absolute form
*/
-static int
-ns_name_ntop(src, dst, dstsiz)
+int
+__ns_name_ntop(src, dst, dstsiz)
const u_char *src;
char *dst;
size_t dstsiz;
@@ -388,7 +388,7 @@ ns_name_ntop(src, dst, dstsiz)
while ((n = *cp++) != 0) {
if ((n & NS_CMPRSFLGS) != 0) {
/* Some kind of compression pointer. */
- __set_errno (EMSGSIZE);
+ __set_errno (EINVAL);
return (-1);
}
if (dn != dst) {
@@ -565,8 +565,8 @@ ns_name_pton(src, dst, dstsiz)
* return:
* -1 if it fails, or consumed octets if it succeeds.
*/
-static int
-ns_name_unpack(msg, eom, src, dst, dstsiz)
+int
+__ns_name_unpack(msg, eom, src, dst, dstsiz)
const u_char *msg;
const u_char *eom;
const u_char *src;
@@ -767,9 +767,9 @@ ns_name_uncompress(msg, eom, src, dst, dstsiz)
u_char tmp[NS_MAXCDNAME];
int n;
- if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
+ if ((n = __ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
return (-1);
- if (ns_name_ntop(tmp, dst, dstsiz) == -1)
+ if (__ns_name_ntop(tmp, dst, dstsiz) == -1)
return (-1);
return (n);
}