mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 09:40:13 +00:00
b85697f61d
1999-12-17 Ulrich Drepper <drepper@cygnus.com> * string/bits/string2.h (__strtok_r_1c): Help gcc optimizing string access. * locale/programs/ld-collate.c: Implement handling of absolute ellipsis. Parsing of file and constructing the internal data structures should now be complete. (collate_finish): Start adding support to generate the data structures which are written out to the file. * intl/dcgettext.c: Rewrite to handle caching of previous results here instead of in the dcgettext macro. * intl/libintl.h (dcgettext): Don't define for systems using this glibc or systems with tsearch. * sysdeps/generic/mathdef.h: Protect definitions for math.h against double inclusion. * sysdeps/alpha/fpu/bits/mathdef.h: Likewise. * sysdeps/i386/fpu/bits/mathdef.h: Likewise. * sysdeps/m68k/fpu/bits/mathdef.h: Likewise. * sysdeps/powerpc/fpu/bits/mathdef.h: Likewise. * sysdeps/i386/fpu/libm-test-ulps: Add more deltas (are mobile PIIs that different?). 1999-12-17 Andreas Jaeger <aj@suse.de> * rt/aio.h (struct aiocb64): Add member __next_prio to sync the struct with aiocb. * rt/Makefile (tests): Added tst-aio64. Added dependency rules for tst-aio64. * rt/tst-aio64.c: New file, copied from tst-aio.c and changed for 64bit tests. 1999-12-15 Thorsten Kukuk <kukuk@suse.de> * sysdeps/unix/sysv/linux/alpha/oldgetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/alpha/oldsetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/bits/resource.h: Change RLIM_INFINITY back to old value (signed long). * sysdeps/unix/sysv/linux/i386/bits/resource.h: New, with unsigned long RLIM_INFINITY. * sysdeps/unix/sysv/linux/getrlimit.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/getrlimit.c: ... here. * sysdeps/unix/sysv/linux/getrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/getrlimit64.c: ... here. * sysdeps/unix/sysv/linux/oldgetrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c: ... here. * sysdeps/unix/sysv/linux/oldsetrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c: ... here. * sysdeps/unix/sysv/linux/setrlimit.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/setrlimit.c: ... here. * sysdeps/unix/sysv/linux/setrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/setrlimit64.c: ... here. * sysdeps/unix/sysv/linux/sparc/bits/resource.h: New. * sysdeps/unix/sysv/linux/sparc/sparc64/oldgetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/sparc/sparc64/oldsetrlimit64.c: Removed. 1999-12-17 Andreas Jaeger <aj@suse.de> * elf/ldconfig.c: Add new option -l to manualy link shared libraries. (options): Added option. (parse_opt): Set option. (main): Handle option. (manual_link): New function. 1999-12-17 Thorsten Kukuk <kukuk@suse.de> * string/bits/string2.h: Fix patch from 1999-12-07. 1999-12-16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/strsep.c: If delim string has only one character don't run over end of string. * locale/programs/ld-collate.c (insert_weights): Also update next pointer of last cursor element. (insert_value): Return nonzero value if nothing got inserted. (handle_ellipsis): Don't do anything if to-value cannot be inserted. 1999-12-10 Jakub Jelinek <jakub@redhat.com> * stdlib/longlong.h (__sparc_v9__): Use %rDIGIT instead of %DIGIT where appropriate. 1999-12-10 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c (__sigaction): Copy sa_flags into kernel sigaction structure. 1999-12-14 Andreas Jaeger <aj@suse.de> * string/tester.c (test_strsep): More tests for access beyond the final NUL. The first two tests come from PR libc/1486 by martinea@iro.umontreal.ca. 1999-12-14 Thorsten Kukuk <kukuk@suse.de> * nis/ypclnt.c: Correct handling of cached client handles. (__xdr_ypresp_all): Call callback function for errors, too, like Solaris does. * nis/nss_compat/compat-grp.c: Make sure errno is always set correct. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. Also use services.byservicename Map if available, optimize query if name/port and protocol is known.
445 lines
10 KiB
C
445 lines
10 KiB
C
/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
|
|
|
|
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 <nss.h>
|
|
#include <ctype.h>
|
|
#include <netdb.h>
|
|
#include <string.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <resolv.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
|
|
#include "nss-nis.h"
|
|
|
|
/* Get implementation for some internal functions. */
|
|
#include <resolv/mapv4v6addr.h>
|
|
|
|
#define ENTNAME hostent
|
|
#define DATABASE "hosts"
|
|
#define NEED_H_ERRNO
|
|
|
|
#define EXTRA_ARGS , af, flags
|
|
#define EXTRA_ARGS_DECL , int af, int flags
|
|
|
|
#define ENTDATA hostent_data
|
|
struct hostent_data
|
|
{
|
|
unsigned char host_addr[16]; /* IPv4 or IPv6 address. */
|
|
char *h_addr_ptrs[2]; /* Points to that and null terminator. */
|
|
};
|
|
|
|
#define TRAILING_LIST_MEMBER h_aliases
|
|
#define TRAILING_LIST_SEPARATOR_P isspace
|
|
#include <nss/nss_files/files-parse.c>
|
|
LINE_PARSER
|
|
("#",
|
|
{
|
|
char *addr;
|
|
|
|
STRING_FIELD (addr, isspace, 1);
|
|
|
|
/* Parse address. */
|
|
if (af == AF_INET && inet_pton (AF_INET, addr, entdata->host_addr) > 0)
|
|
{
|
|
if (flags & AI_V4MAPPED)
|
|
{
|
|
map_v4v6_address ((char *) entdata->host_addr,
|
|
(char *) entdata->host_addr);
|
|
result->h_addrtype = AF_INET6;
|
|
result->h_length = IN6ADDRSZ;
|
|
}
|
|
else
|
|
{
|
|
result->h_addrtype = AF_INET;
|
|
result->h_length = INADDRSZ;
|
|
}
|
|
}
|
|
else if (af == AF_INET6
|
|
&& inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
|
|
{
|
|
result->h_addrtype = AF_INET6;
|
|
result->h_length = IN6ADDRSZ;
|
|
}
|
|
else
|
|
/* Illegal address: ignore line. */
|
|
return 0;
|
|
|
|
/* Store a pointer to the address in the expected form. */
|
|
entdata->h_addr_ptrs[0] = entdata->host_addr;
|
|
entdata->h_addr_ptrs[1] = NULL;
|
|
result->h_addr_list = entdata->h_addr_ptrs;
|
|
|
|
STRING_FIELD (result->h_name, isspace, 1);
|
|
})
|
|
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
static bool_t new_start = 1;
|
|
static char *oldkey = NULL;
|
|
static int oldkeylen = 0;
|
|
|
|
enum nss_status
|
|
_nss_nis_sethostent (void)
|
|
{
|
|
__libc_lock_lock (lock);
|
|
|
|
new_start = 1;
|
|
if (oldkey != NULL)
|
|
{
|
|
free (oldkey);
|
|
oldkey = NULL;
|
|
oldkeylen = 0;
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_endhostent (void)
|
|
{
|
|
__libc_lock_lock (lock);
|
|
|
|
new_start = 1;
|
|
if (oldkey != NULL)
|
|
{
|
|
free (oldkey);
|
|
oldkey = NULL;
|
|
oldkeylen = 0;
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
/* The calling function always need to get a lock first. */
|
|
static enum nss_status
|
|
internal_nis_gethostent_r (struct hostent *host, char *buffer,
|
|
size_t buflen, int *errnop, int *h_errnop,
|
|
int af, int flags)
|
|
{
|
|
char *domain;
|
|
char *result;
|
|
int len, parse_res;
|
|
char *outkey;
|
|
int keylen;
|
|
struct parser_data *data = (void *) buffer;
|
|
size_t linebuflen = buffer + buflen - data->linebuffer;
|
|
|
|
if (yp_get_default_domain (&domain))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
if (buflen < sizeof *data + 1)
|
|
{
|
|
*errnop = ERANGE;
|
|
*h_errnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
do
|
|
{
|
|
enum nss_status retval;
|
|
char *p;
|
|
|
|
if (new_start)
|
|
retval = yperr2nss (yp_first (domain, "hosts.byname",
|
|
&outkey, &keylen, &result, &len));
|
|
else
|
|
retval = yperr2nss ( yp_next (domain, "hosts.byname",
|
|
oldkey, oldkeylen,
|
|
&outkey, &keylen, &result, &len));
|
|
|
|
if (retval != NSS_STATUS_SUCCESS)
|
|
{
|
|
switch (retval)
|
|
{
|
|
case NSS_STATUS_TRYAGAIN:
|
|
*errnop = errno;
|
|
*h_errnop = TRY_AGAIN;
|
|
break;
|
|
case NSS_STATUS_NOTFOUND:
|
|
*errnop = ENOENT;
|
|
*h_errnop = HOST_NOT_FOUND;
|
|
break;
|
|
default:
|
|
*h_errnop = NO_RECOVERY;
|
|
break;
|
|
}
|
|
return retval;
|
|
}
|
|
|
|
if ((size_t) (len + 1) > linebuflen)
|
|
{
|
|
free (result);
|
|
*h_errnop = NETDB_INTERNAL;
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
p = strncpy (data->linebuffer, result, len);
|
|
data->linebuffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
|
|
parse_res = parse_line (p, host, data, buflen, errnop, af, flags);
|
|
if (parse_res == -1)
|
|
{
|
|
free (outkey);
|
|
*h_errnop = NETDB_INTERNAL;
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
free (oldkey);
|
|
oldkey = outkey;
|
|
oldkeylen = keylen;
|
|
new_start = 0;
|
|
}
|
|
while (!parse_res);
|
|
|
|
*h_errnop = NETDB_SUCCESS;
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_gethostent_r (struct hostent *host, char *buffer, size_t buflen,
|
|
int *errnop, int *h_errnop)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_gethostent_r (host, buffer, buflen, errnop, h_errnop,
|
|
((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET),
|
|
((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0 ));
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
|
|
char *buffer, size_t buflen, int *errnop,
|
|
int *h_errnop, int flags)
|
|
{
|
|
enum nss_status retval;
|
|
char *domain, *result, *p;
|
|
int len, parse_res;
|
|
struct parser_data *data = (void *) buffer;
|
|
size_t linebuflen = buffer + buflen - data->linebuffer;
|
|
|
|
if (name == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (yp_get_default_domain (&domain))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
if (buflen < sizeof *data + 1)
|
|
{
|
|
*h_errnop = NETDB_INTERNAL;
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
/* Convert name to lowercase. */
|
|
size_t namlen = strlen (name);
|
|
char name2[namlen + 1];
|
|
int i;
|
|
|
|
for (i = 0; i < namlen; ++i)
|
|
name2[i] = tolower (name[i]);
|
|
name2[i] = '\0';
|
|
|
|
retval = yperr2nss (yp_match (domain, "hosts.byname", name2,
|
|
namlen, &result, &len));
|
|
|
|
}
|
|
|
|
if (retval != NSS_STATUS_SUCCESS)
|
|
{
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
{
|
|
*h_errnop = TRY_AGAIN;
|
|
*errnop = errno;
|
|
}
|
|
if (retval == NSS_STATUS_NOTFOUND)
|
|
*h_errnop = HOST_NOT_FOUND;
|
|
return retval;
|
|
}
|
|
|
|
if ((size_t) (len + 1) > linebuflen)
|
|
{
|
|
free (result);
|
|
*h_errnop = NETDB_INTERNAL;
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
p = strncpy (data->linebuffer, result, len);
|
|
data->linebuffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
|
|
parse_res = parse_line (p, host, data, buflen, errnop, af, flags);
|
|
|
|
if (parse_res < 1 || host->h_addrtype != af)
|
|
{
|
|
if (parse_res == -1)
|
|
{
|
|
*h_errnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
*h_errnop = HOST_NOT_FOUND;
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
}
|
|
|
|
*h_errnop = NETDB_SUCCESS;
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_gethostbyname2_r (const char *name, int af, struct hostent *host,
|
|
char *buffer, size_t buflen, int *errnop,
|
|
int *h_errnop)
|
|
{
|
|
return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop,
|
|
h_errnop,
|
|
((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0));
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_gethostbyname_r (const char *name, struct hostent *host, char *buffer,
|
|
size_t buflen, int *errnop, int *h_errnop)
|
|
{
|
|
if (_res.options & RES_USE_INET6)
|
|
{
|
|
enum nss_status status;
|
|
|
|
status = internal_gethostbyname2_r (name, AF_INET6, host, buffer, buflen,
|
|
errnop, h_errnop, AI_V4MAPPED);
|
|
if (status == NSS_STATUS_SUCCESS)
|
|
return status;
|
|
}
|
|
|
|
return internal_gethostbyname2_r (name, AF_INET, host, buffer, buflen,
|
|
errnop, h_errnop, 0);
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_gethostbyaddr_r (char *addr, size_t addrlen, int af,
|
|
struct hostent *host, char *buffer, size_t buflen,
|
|
int *errnop, int *h_errnop)
|
|
{
|
|
enum nss_status retval;
|
|
char *domain, *result, *p;
|
|
int len, parse_res;
|
|
char *buf;
|
|
struct parser_data *data = (void *) buffer;
|
|
size_t linebuflen = buffer + buflen - data->linebuffer;
|
|
|
|
if (yp_get_default_domain (&domain))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
if (buflen < sizeof *data + 1)
|
|
{
|
|
*errnop = ERANGE;
|
|
*h_errnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
buf = inet_ntoa (*(struct in_addr *) addr);
|
|
|
|
retval = yperr2nss (yp_match (domain, "hosts.byaddr", buf,
|
|
strlen (buf), &result, &len));
|
|
|
|
if (retval != NSS_STATUS_SUCCESS)
|
|
{
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
{
|
|
*h_errnop = TRY_AGAIN;
|
|
*errnop = errno;
|
|
}
|
|
if (retval == NSS_STATUS_NOTFOUND)
|
|
{
|
|
*h_errnop = HOST_NOT_FOUND;
|
|
*errnop = ENOENT;
|
|
}
|
|
return retval;
|
|
}
|
|
|
|
if ((size_t) (len + 1) > linebuflen)
|
|
{
|
|
free (result);
|
|
*errnop = ERANGE;
|
|
*h_errnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
p = strncpy (data->linebuffer, result, len);
|
|
data->linebuffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
|
|
parse_res = parse_line (p, host, data, buflen, errnop, af,
|
|
((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0));
|
|
if (parse_res < 1)
|
|
{
|
|
if (parse_res == -1)
|
|
{
|
|
*h_errnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
*h_errnop = HOST_NOT_FOUND;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
}
|
|
|
|
*h_errnop = NETDB_SUCCESS;
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getipnodebyname_r (const char *name, int af, int flags,
|
|
struct hostent *result, char *buffer,
|
|
size_t buflen, int *errnop, int *herrnop)
|
|
{
|
|
return internal_gethostbyname2_r (name, af, result, buffer, buflen,
|
|
errnop, herrnop, flags);
|
|
}
|