mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
9d4d69b88b
* conform/conformtest.pl (@headers): Add sys/utsname.h, sys/un.h, sys/socket.h, spawn.h, netinet/tcp.h, netinet/in.h, net/if.h, and arpa/inet.h. * conform/data/fcntl.h-data: Add F_GETOWN, F_SETOWN, SEEK_SET, SEEK_CUR, SEEK_END, S_IFMT, S_IFBLK, S_IFCHR, S_IFIFO, S_IFREG, S_IFDIR, S_IFLNK, S_IFSOCK, S_IRWXU, S_IRUSR S_IWUSR, S_IXUSR, S_IRWXG, S_IRGRP, S_IWGRP, S_IXGRP, S_IRWXO, S_IROTH, S_IWOTH, S_IXOTH, S_ISUID, S_ISGID, S_ISVTX, POSIX_FADV_NORMAL, POSIX_FADV_SEQUENTIAL, POSIX_FADV_RANDOM, POSIX_FADV_WILLNEED, POSIX_FADV_DONTNEED, POSIX_FADV_NOREUSE, posix_fadvise, posix_fallocate, and posix_madvise. * conform/data/netdb.h-data: New file. * conform/data/pthread.h-data: Add pthread_barrier_t, pthread_barrierattr_t, pthread_barrier_destroy, pthread_barrier_init, pthread_barrier_wait, pthread_barrierattr_destroy, pthread_barrierattr_getpshared, pthread_barrierattr_init, pthread_barrierattr_setpshared, pthread_condattr_getclock, pthread_condattr_setclock, pthread_getcpuclockid, pthread_mutex_timedlock, pthread_rwlock_timedrdlock, pthread_rwlock_timedwrlock, pthread_sigmask, pthread_spin_destroy, pthread_spin_init, pthread_spin_lock, pthread_spin_trylock, and pthread_spin_unlock. * conform/data/sched.h-data: Add sched_ss_low_priority, sched_ss_repl_period, sched_ss_init_budget, sched_ss_max_repl, and SCHED_SPORADIC. * conform/data/semaphore.h-data: Add sem_timedwait. * conform/data/signal.h-data: Add SIGIO. * conform/data/spawn.h-data: New file. * conform/data/stdlib.h-data: Add posix_memalign, setenv, and unsetenv. * conform/data/time.h-data: Add CLOCK_PROCESS_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID, clock_getcpuclockid, and clock_nanosleep. Fix typo in gmtime_r definition. * conform/data/unistd.h-data: Add _POSIX_ADVISORY_INFO, _POSIX_ASYNCHRONOUS_IO, _POSIX_BARRIERS, _POSIX_MONOTONIC_CLOCK, _POSIX_READER_WRITER_LOCKS, _POSIX_SHELL, _POSIX_SPAWN, _POSIX_SPIN_LOCKS, _POSIX_SPORADIC_SERVER, _POSIX_THREAD_CPUTIME, _POSIX_TYPED_MEMORY_OBJECTS, _POSIX_THREAD_SPORADIC_SERVER, _XOPEN_STREAMS, _POSIX_TIMEOUTS, _POSIX2_PBS, _POSIX2_PBS_ACCOUNTING, _POSIX2_PBS_CHECKPOINT, _POSIX2_PBS_LOCATE, _POSIX2_PBS_MESSAGE, _POSIX2_PBS_TRACK, _SC_2_PBS, _SC_2_PBS_ACCOUNTING, _SC_2_PBS_CHECKPOINT, _SC_2_PBS_LOCATE, _SC_2_PBS_MESSAGE, _SC_2_PBS_TRACK, _SC_BARRIERS, _SC_BASE, _SC_CLOCK_SELECTION, _SC_DEVICE_IO, _SC_DEVICE_SPECIFIC, _SC_DEVICE_SPECIFIC_R, _SC_FD_MGMT, _SC_FIFO, _SC_FILE_ATTRIBUTES, _SC_FILE_LOCKING, _SC_FILE_SYSTEM, _SC_MEMORY_PROTECTION, _SC_MESSAGE_PASSING, _SC_MONOTONIC_CLOCK, _SC_MESSAGE_PASSING, _SC_MONOTONIC_CLOCK, _SC_MULTIPLE_PROCESS, _SC_NETWORKING, _SC_PIPE, _SC_READER_WRITER_LOCKS, _SC_REGEXP, _SC_SHELL, _SC_SIGNALS, _SC_SINGLE_PROCESS, _SC_SPIN_LOCKS, _SC_TYPED_MEMORY_OBJECTS, _SC_USER_GROUPS, _SC_USER_GROUPS_R, _SC_STREAMS, _PC_REC_INCR_XFER_SIZE, _PC_REC_MAX_XFER_SIZE, _PC_REC_MIN_XFER_SIZE, _PC_REC_XFER_ALIGN, setegid, seteuid. Fix typo in off_t definition. * conform/data/net/if.h-data: New file. * conform/data/netinet/in.h-data: New file. * conform/data/netinet/tcp.h-data: New file. * conform/data/sys/mman.h-data: Add POSIX_MADV_NORMAL, POSIX_MADV_SEQUENTIAL, POSIX_MADV_RANDOM, POSIX_MADV_WILLNEED, POSIX_MADV_DONTNEED, POSIX_TYPED_MEM_ALLOCATE, POSIX_TYPED_MEM_ALLOCATE_CONTIG, POSIX_TYPED_MEM_MAP_ALLOCATABLE, posix_typedmem_info, posix_mem_offset, posix_typed_mem_get_info, and posix_typed_mem_open. * conform/data/sys/socket.h-data: New file. * conform/data/sys/stat.h-data: Add S_TYPEISTMO and isfdtype. * conform/data/sys/types.h-data: Add pthread_barrier_t, pthread_barrierattr_t, and pthread_spinlock_t. * conform/data/sys/un.h-data: New file. * conform/data/sys/utsname.h-data: New file. * include/netdb.h (__gethostbyaddr_r): Fix types of first and second parameter. * inet/gethstbyad.c (gethostbyname): Likewise. * inet/gethstbyad_t.c (gethostbyname_r): Likewise. * inet/getipnodebyad.c (getipnodebyad): Likewise. * nis/nss_nis/nis-hosts.c (_nss_nis_gethostbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_gethostbyaddr_r): Likewise. * nscd/gethstbyad_r.c (gethostbyaddr_r): Likewise. * nscd/nscd_gethst_r.c (__nscd_gethostbyaddr_r): Likewise. * nscd/nscd_proto.h (__nscd_gethostbyaddr_r): Likewise. * nss/nss_files/files-hosts.c (_nss_files_gethostbyaddr_r): Likewise. * resolv/gethnamaddr.c (gethostbyname): Likewise. * resolv/netdb.h (struct hostent): Fix type of h_length member. (gethostbyaddr, getipnodebyaddr, gethostbyaddr_r): Fix types of first and second parameter. 2000-04-29 Andreas Jaeger <aj@suse.de> * conform/data/arpa/inet.h-data: New file.
311 lines
7.8 KiB
C
311 lines
7.8 KiB
C
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <netdb.h>
|
|
#include <resolv.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <arpa/nameser.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/uio.h>
|
|
#include <sys/un.h>
|
|
|
|
#include "nscd-client.h"
|
|
#include "nscd_proto.h"
|
|
|
|
int __nss_not_use_nscd_hosts;
|
|
|
|
static int nscd_gethst_r (const char *key, size_t keylen, request_type type,
|
|
struct hostent *resultbuf, char *buffer,
|
|
size_t buflen, int *h_errnop) internal_function;
|
|
|
|
|
|
int
|
|
__nscd_gethostbyname_r (const char *name, struct hostent *resultbuf,
|
|
char *buffer, size_t buflen, int *h_errnop)
|
|
{
|
|
request_type reqtype;
|
|
|
|
reqtype = (_res.options & RES_USE_INET6) ? GETHOSTBYNAMEv6 : GETHOSTBYNAME;
|
|
|
|
return nscd_gethst_r (name, strlen (name) + 1, reqtype, resultbuf,
|
|
buffer, buflen, h_errnop);
|
|
}
|
|
|
|
|
|
int
|
|
__nscd_gethostbyname2_r (const char *name, int af, struct hostent *resultbuf,
|
|
char *buffer, size_t buflen, int *h_errnop)
|
|
{
|
|
request_type reqtype;
|
|
|
|
reqtype = af == AF_INET6 ? GETHOSTBYNAMEv6 : GETHOSTBYNAME;
|
|
|
|
return nscd_gethst_r (name, strlen (name) + 1, reqtype, resultbuf,
|
|
buffer, buflen, h_errnop);
|
|
}
|
|
|
|
|
|
int
|
|
__nscd_gethostbyaddr_r (const void *addr, socklen_t len, int type,
|
|
struct hostent *resultbuf, char *buffer, size_t buflen,
|
|
int *h_errnop)
|
|
{
|
|
request_type reqtype;
|
|
|
|
if (!((len == INADDRSZ && type == AF_INET)
|
|
|| (len == IN6ADDRSZ && type == AF_INET6)))
|
|
/* LEN and TYPE do not match. */
|
|
return -1;
|
|
|
|
reqtype = type == AF_INET6 ? GETHOSTBYADDRv6 : GETHOSTBYADDR;
|
|
|
|
return nscd_gethst_r (addr, len, reqtype, resultbuf, buffer, buflen,
|
|
h_errnop);
|
|
}
|
|
|
|
|
|
/* Create a socket connected to a name. */
|
|
static int
|
|
open_socket (void)
|
|
{
|
|
struct sockaddr_un addr;
|
|
int sock;
|
|
int saved_errno = errno;
|
|
|
|
sock = __socket (PF_UNIX, SOCK_STREAM, 0);
|
|
if (sock < 0)
|
|
{
|
|
__set_errno (saved_errno);
|
|
return -1;
|
|
}
|
|
|
|
addr.sun_family = AF_UNIX;
|
|
strcpy (addr.sun_path, _PATH_NSCDSOCKET);
|
|
if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
|
|
{
|
|
__close (sock);
|
|
__set_errno (saved_errno);
|
|
return -1;
|
|
}
|
|
|
|
return sock;
|
|
}
|
|
|
|
|
|
static int
|
|
internal_function
|
|
nscd_gethst_r (const char *key, size_t keylen, request_type type,
|
|
struct hostent *resultbuf, char *buffer, size_t buflen,
|
|
int *h_errnop)
|
|
{
|
|
int sock = open_socket ();
|
|
hst_response_header hst_resp;
|
|
request_header req;
|
|
ssize_t nbytes;
|
|
|
|
if (sock == -1)
|
|
{
|
|
__nss_not_use_nscd_group = 1;
|
|
return -1;
|
|
}
|
|
|
|
req.version = NSCD_VERSION;
|
|
req.type = type;
|
|
req.key_len = keylen;
|
|
nbytes = __write (sock, &req, sizeof (request_header));
|
|
if (nbytes != sizeof (request_header))
|
|
{
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
|
|
nbytes = __write (sock, key, req.key_len);
|
|
if (nbytes != req.key_len)
|
|
{
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
|
|
nbytes = __read (sock, &hst_resp, sizeof (hst_response_header));
|
|
if (nbytes != sizeof (hst_response_header))
|
|
{
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
|
|
if (hst_resp.found == -1)
|
|
{
|
|
/* The daemon does not cache this database. */
|
|
__close (sock);
|
|
__nss_not_use_nscd_hosts = 1;
|
|
return -1;
|
|
}
|
|
|
|
if (hst_resp.found == 1)
|
|
{
|
|
struct iovec vec[4];
|
|
size_t *aliases_len;
|
|
char *cp = buffer;
|
|
uintptr_t align1;
|
|
uintptr_t align2;
|
|
size_t total_len;
|
|
ssize_t cnt;
|
|
char *ignore;
|
|
int n;
|
|
|
|
/* A first check whether the buffer is sufficiently large is possible. */
|
|
/* Now allocate the buffer the array for the group members. We must
|
|
align the pointer and the base of the h_addr_list pointers. */
|
|
align1 = ((__alignof__ (char *) - (cp - ((char *) 0)))
|
|
& (__alignof__ (char *) - 1));
|
|
align2 = ((__alignof__ (char *) - ((cp + align1 + hst_resp.h_name_len)
|
|
- ((char *) 0)))
|
|
& (__alignof__ (char *) - 1));
|
|
if (buflen < (align1 + hst_resp.h_name_len + align2
|
|
+ ((hst_resp.h_aliases_cnt + hst_resp.h_addr_list_cnt + 2)
|
|
* sizeof (char *))
|
|
+ hst_resp.h_addr_list_cnt * (type == AF_INET
|
|
? INADDRSZ : IN6ADDRSZ)))
|
|
{
|
|
no_room:
|
|
__set_errno (ERANGE);
|
|
__close (sock);
|
|
return ERANGE;
|
|
}
|
|
cp += align1;
|
|
|
|
/* Prepare the result as far as we can. */
|
|
resultbuf->h_aliases = (char **) cp;
|
|
cp += (hst_resp.h_aliases_cnt + 1) * sizeof (char *);
|
|
resultbuf->h_addr_list = (char **) cp;
|
|
cp += (hst_resp.h_addr_list_cnt + 1) * sizeof (char *);
|
|
|
|
resultbuf->h_name = cp;
|
|
cp += hst_resp.h_name_len + align2;
|
|
vec[0].iov_base = resultbuf->h_name;
|
|
vec[0].iov_len = hst_resp.h_name_len;
|
|
|
|
aliases_len = alloca (hst_resp.h_aliases_cnt * sizeof (size_t));
|
|
vec[1].iov_base = aliases_len;
|
|
vec[1].iov_len = hst_resp.h_aliases_cnt * sizeof (size_t);
|
|
|
|
total_len = (hst_resp.h_name_len
|
|
+ hst_resp.h_aliases_cnt * sizeof (size_t));
|
|
|
|
n = 2;
|
|
if (type == GETHOSTBYADDR || type == GETHOSTBYNAME)
|
|
{
|
|
vec[2].iov_base = cp;
|
|
vec[2].iov_len = hst_resp.h_addr_list_cnt * INADDRSZ;
|
|
|
|
ignore = alloca (hst_resp.h_addr_list_cnt * IN6ADDRSZ);
|
|
vec[3].iov_base = ignore;
|
|
vec[3].iov_len = hst_resp.h_addr_list_cnt * IN6ADDRSZ;
|
|
|
|
for (cnt = 0; cnt < hst_resp.h_addr_list_cnt; ++cnt)
|
|
{
|
|
resultbuf->h_addr_list[cnt] = cp;
|
|
cp += INADDRSZ;
|
|
}
|
|
|
|
resultbuf->h_addrtype = AF_INET;
|
|
resultbuf->h_length = INADDRSZ;
|
|
|
|
total_len += hst_resp.h_addr_list_cnt * (INADDRSZ + IN6ADDRSZ);
|
|
|
|
n = 4;
|
|
}
|
|
else
|
|
{
|
|
if (hst_resp.h_length == INADDRSZ)
|
|
{
|
|
ignore = alloca (hst_resp.h_addr_list_cnt * INADDRSZ);
|
|
vec[2].iov_base = ignore;
|
|
vec[2].iov_len = hst_resp.h_addr_list_cnt * INADDRSZ;
|
|
|
|
total_len += hst_resp.h_addr_list_cnt * INADDRSZ;
|
|
|
|
n = 3;
|
|
}
|
|
|
|
vec[n].iov_base = cp;
|
|
vec[n].iov_len = hst_resp.h_addr_list_cnt * IN6ADDRSZ;
|
|
|
|
for (cnt = 0; cnt < hst_resp.h_addr_list_cnt; ++cnt)
|
|
{
|
|
resultbuf->h_addr_list[cnt] = cp;
|
|
cp += IN6ADDRSZ;
|
|
}
|
|
|
|
resultbuf->h_addrtype = AF_INET6;
|
|
resultbuf->h_length = IN6ADDRSZ;
|
|
|
|
total_len += hst_resp.h_addr_list_cnt * IN6ADDRSZ;
|
|
|
|
++n;
|
|
}
|
|
resultbuf->h_addr_list[cnt] = NULL;
|
|
|
|
if (__readv (sock, vec, n) != total_len)
|
|
{
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
|
|
/* Now we also can read the aliases. */
|
|
total_len = 0;
|
|
for (cnt = 0; cnt < hst_resp.h_aliases_cnt; ++cnt)
|
|
{
|
|
resultbuf->h_aliases[cnt] = cp;
|
|
cp += aliases_len[cnt];
|
|
total_len += aliases_len[cnt];
|
|
}
|
|
resultbuf->h_aliases[cnt] = NULL;
|
|
|
|
/* See whether this would exceed the buffer capacity. */
|
|
if (cp > buffer + buflen)
|
|
goto no_room;
|
|
|
|
/* And finally read the aliases. */
|
|
if (__read (sock, resultbuf->h_aliases[0], total_len) != total_len)
|
|
{
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
|
|
__close (sock);
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
/* Store the error number. */
|
|
*h_errnop = hst_resp.error;
|
|
|
|
__close (sock);
|
|
/* The `errno' to some value != ERANGE. */
|
|
__set_errno (ENOENT);
|
|
return ENOENT;
|
|
}
|
|
}
|