aboutsummaryrefslogtreecommitdiff
path: root/resolv/nss_dns
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-10-09 09:42:48 +0000
committerUlrich Drepper <drepper@redhat.com>2002-10-09 09:42:48 +0000
commit6166815d696407069c33c1f0cad76fb1847e4bc7 (patch)
treed7aaf5fd8551eb6d69fb80863a4a415cfaa9c01a /resolv/nss_dns
parent4c2821faea94c4300fe283f13e4a667f1f73b90b (diff)
downloadglibc-6166815d696407069c33c1f0cad76fb1847e4bc7.zip
glibc-6166815d696407069c33c1f0cad76fb1847e4bc7.tar.gz
glibc-6166815d696407069c33c1f0cad76fb1847e4bc7.tar.bz2
Update.
2002-10-09 Ulrich Drepper <drepper@redhat.com> * Versions.def (libc): Add GLIBC_2.3.1. (libpthread): Add GLIBC_2.3.1. * include/signal.h: Add libc_hidden_proto for __sigwait, __sigwaitinfo, and __sigtimedwait. * signal/Versions: Add __sigtimedwait, __sigwait, and __sigwaitinfo. * sysdeps/unix/sysv/linux/sigtimedwait.c (__sigtimedwait): Add libc_hidden_def. * sysdeps/unix/sysv/linux/sigwait.c (__sigwait): Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c (__sigwaitinfo): Likewise. * include/sys/msg.h: Declare __libc_msgrcv and __libc_msgsnd. * sysdeps/unix/sysv/linux/msgrcv.c (__msgrcv): Rename to __libc_msgrcv and make old name an alias. * sysdeps/unix/sysv/linux/msgsnd.c (__msgsnd): Rename to __libc_msgsnd and make old name an alias. * sysvipc/Versions (libc) [GLIBC_PRIVATE]: Add __libc_msgrcv and __libc_msgsnd. * include/sys/uio.h: Declare __libc_readv and __libc_writev. * misc/Versions (libc) [GLIBC_PRIVATE]: Add __libc_readv and __libc_writev. * sysdeps/generic/readv.c (__readv): Rename to __libc_readv and make old name an alias. * sysdeps/posix/readv.c: Likewise * sysdeps/unix/sysv/aix/readv.c: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/generic/writev.c (__writev): Rename to __libc_writev and make old name an alias. * sysdeps/posix/writev.c: Likewise * sysdeps/unix/sysv/aix/writev.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise. * include/sys/wait.h: Declare __waitid. * posix/Versions (libc) [GLIBC_PRIVATE]: Add __waitid. * sysdeps/generic/waitid.c (waitid): Rename to __waitid and make old name an alias. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/sysv/aix/waitid.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add creat syscall. 2002-10-07 Jakub Jelinek <jakub@redhat.com> * include/alloca.h (__libc_use_alloca, __libc_alloca_cutoff): New prototypes. (__MAX_ALLOCA_CUTOFF): Define. Include allocalim.h. * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r, _nss_dns_gethostbyaddr_r): Use alloca or malloc to allocate host_buffer depending on __libc_use_alloca. * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyname_r, _nss_dns_getnetbyaddr_r): Use alloca or malloc to allocate net_buffer depending on __libc_use_alloca. * resolv/res_query.c (res_nquery): Use alloca or malloc to allocate buf depending on __libc_use_alloca. * resolv/gethnamaddr.c (gethostbyname2, gethostbyaddr): Likewise. * stdio-common/vfprintf.c (vfprintf): Use __libc_use_alloca instead of hardcoded constants. Pass proper size argument to alloca and compute end for wide char version. * stdio-common/printf_fp.c (__printf_fp): Use __libc_use_alloca instead of hardcoded constants. * string/strcoll.c (strcoll): Likewise. * string/strxfrm.c (strxfrm): Likewise. * sysdeps/posix/readv.c (__readv): Likewise. * sysdeps/posix/writev.c (__writev): Likewise. * sysdeps/generic/allocalim.h: New file.
Diffstat (limited to 'resolv/nss_dns')
-rw-r--r--resolv/nss_dns/dns-host.c70
-rw-r--r--resolv/nss_dns/dns-network.c57
2 files changed, 101 insertions, 26 deletions
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index c7bfc13..39eccab 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -132,12 +132,13 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *h_errnop)
{
- querybuf host_buffer;
+ querybuf *host_buffer;
char tmp[NS_MAXDNAME];
int size, type, n;
const char *cp;
- int map = 0;
+ int map = 0, use_malloc = 0;
int olderr = errno;
+ enum nss_status status;
if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
return NSS_STATUS_UNAVAIL;
@@ -169,8 +170,21 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
&& (cp = res_hostalias (&_res, name, tmp, sizeof (tmp))) != NULL)
name = cp;
- n = res_nsearch (&_res, name, C_IN, type, host_buffer.buf,
- sizeof (host_buffer.buf));
+ if (!__libc_use_alloca (MAXPACKET))
+ {
+ host_buffer = (querybuf *) malloc (sizeof (querybuf));
+ if (host_buffer == NULL)
+ {
+ *errnop = ENOMEM;
+ return NSS_STATUS_UNAVAIL;
+ }
+ use_malloc = 1;
+ }
+ else
+ host_buffer = (querybuf *) alloca (sizeof (querybuf));
+
+ n = res_nsearch (&_res, name, C_IN, type, host_buffer->buf,
+ sizeof (host_buffer->buf));
if (n < 0)
{
enum nss_status status = (errno == ECONNREFUSED
@@ -185,11 +199,15 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
by having the RES_USE_INET6 bit in _res.options set, we try
another lookup. */
if (af == AF_INET6 && (_res.options & RES_USE_INET6))
- n = res_nsearch (&_res, name, C_IN, T_A, host_buffer.buf,
- sizeof (host_buffer.buf));
+ n = res_nsearch (&_res, name, C_IN, T_A, host_buffer->buf,
+ sizeof (host_buffer->buf));
if (n < 0)
- return status;
+ {
+ if (use_malloc)
+ free (host_buffer);
+ return status;
+ }
map = 1;
@@ -197,8 +215,11 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
result->h_length = INADDRSZ;;
}
- return getanswer_r (&host_buffer, n, name, type, result, buffer, buflen,
- errnop, h_errnop, map);
+ status = getanswer_r (host_buffer, n, name, type, result, buffer, buflen,
+ errnop, h_errnop, map);
+ if (use_malloc)
+ free (host_buffer);
+ return status;
}
@@ -236,10 +257,10 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
char *h_addr_ptrs[MAX_NR_ADDRS + 1];
char linebuffer[0];
} *host_data = (struct host_data *) buffer;
- querybuf host_buffer;
+ querybuf *host_buffer;
char qbuf[MAXDNAME+1], *qp = NULL;
size_t size;
- int n, status;
+ int n, status, use_malloc = 0;
int olderr = errno;
if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
@@ -294,23 +315,40 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
break;
}
- n = res_nquery (&_res, qbuf, C_IN, T_PTR, (u_char *)host_buffer.buf,
- sizeof host_buffer);
+ if (!__libc_use_alloca (MAXPACKET))
+ {
+ host_buffer = (querybuf *) malloc (sizeof (querybuf));
+ if (host_buffer == NULL)
+ {
+ *errnop = ENOMEM;
+ return NSS_STATUS_UNAVAIL;
+ }
+ use_malloc = 1;
+ }
+ else
+ host_buffer = (querybuf *) alloca (sizeof (querybuf));
+
+ n = res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer->buf,
+ sizeof (host_buffer->buf));
if (n < 0 && af == AF_INET6)
{
strcpy (qp, "ip6.int");
- n = res_nquery (&_res, qbuf, C_IN, T_PTR, (u_char *)host_buffer.buf,
- sizeof host_buffer);
+ n = res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer->buf,
+ sizeof (host_buffer->buf));
}
if (n < 0)
{
*h_errnop = h_errno;
__set_errno (olderr);
+ if (use_malloc)
+ free (host_buffer);
return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
}
- status = getanswer_r (&host_buffer, n, qbuf, T_PTR, result, buffer, buflen,
+ status = getanswer_r (host_buffer, n, qbuf, T_PTR, result, buffer, buflen,
errnop, h_errnop, 0 /* XXX */);
+ if (use_malloc)
+ free (host_buffer);
if (status != NSS_STATUS_SUCCESS)
{
*h_errnop = h_errno;
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 774c868..9a366ac 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -110,27 +110,47 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
int *herrnop)
{
/* Return entry for network with NAME. */
- querybuf net_buffer;
- int anslen;
+ querybuf *net_buffer;
+ int anslen, use_malloc = 0;
char *qbuf;
+ enum nss_status status;
if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
return NSS_STATUS_UNAVAIL;
qbuf = strdupa (name);
- anslen = res_nsearch (&_res, qbuf, C_IN, T_PTR, (u_char *) &net_buffer,
- sizeof (querybuf));
+
+ if (!__libc_use_alloca (MAXPACKET))
+ {
+ net_buffer = (querybuf *) malloc (sizeof (querybuf));
+ if (net_buffer == NULL)
+ {
+ *errnop = ENOMEM;
+ return NSS_STATUS_UNAVAIL;
+ }
+ use_malloc = 1;
+ }
+ else
+ net_buffer = (querybuf *) alloca (sizeof (querybuf));
+
+ anslen = res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer->buf,
+ sizeof (net_buffer->buf));
if (anslen < 0)
{
/* Nothing found. */
*errnop = errno;
+ if (use_malloc)
+ free (net_buffer);
return (errno == ECONNREFUSED
|| errno == EPFNOSUPPORT
|| errno == EAFNOSUPPORT)
? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
}
- return getanswer_r (&net_buffer, anslen, result, buffer, buflen, BYNAME);
+ status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYNAME);
+ if (use_malloc)
+ free (net_buffer);
+ return status;
}
@@ -141,10 +161,10 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result,
{
/* Return entry for network with NAME. */
enum nss_status status;
- querybuf net_buffer;
+ querybuf *net_buffer;
unsigned int net_bytes[4];
char qbuf[MAXDNAME];
- int cnt, anslen;
+ int cnt, anslen, use_malloc = 0;
u_int32_t net2;
int olderr = errno;
@@ -181,20 +201,37 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result,
break;
}
- anslen = res_nquery (&_res, qbuf, C_IN, T_PTR, (u_char *) &net_buffer,
- sizeof (querybuf));
+ if (!__libc_use_alloca (MAXPACKET))
+ {
+ net_buffer = (querybuf *) malloc (sizeof (querybuf));
+ if (net_buffer == NULL)
+ {
+ *errnop = ENOMEM;
+ return NSS_STATUS_UNAVAIL;
+ }
+ use_malloc = 1;
+ }
+ else
+ net_buffer = (querybuf *) alloca (sizeof (querybuf));
+
+ anslen = res_nquery (&_res, qbuf, C_IN, T_PTR, net_buffer->buf,
+ sizeof (net_buffer->buf));
if (anslen < 0)
{
/* Nothing found. */
int err = errno;
__set_errno (olderr);
+ if (use_malloc)
+ free (net_buffer);
return (err == ECONNREFUSED
|| err == EPFNOSUPPORT
|| err == EAFNOSUPPORT)
? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
}
- status = getanswer_r (&net_buffer, anslen, result, buffer, buflen, BYADDR);
+ status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYADDR);
+ if (use_malloc)
+ free (net_buffer);
if (status == NSS_STATUS_SUCCESS)
{
/* Strip trailing zeros. */