mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08: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.
391 lines
9.1 KiB
C
391 lines
9.1 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 <netdb.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
|
|
#include "nss-nis.h"
|
|
|
|
|
|
/* Get the declaration of the parser function. */
|
|
#define ENTNAME servent
|
|
#define EXTERN_PARSER
|
|
#include <nss/nss_files/files-parse.c>
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
struct response_t
|
|
{
|
|
char *val;
|
|
struct response_t *next;
|
|
};
|
|
|
|
struct intern_t
|
|
{
|
|
struct response_t *start;
|
|
struct response_t *next;
|
|
};
|
|
typedef struct intern_t intern_t;
|
|
|
|
static intern_t intern = { NULL, NULL };
|
|
|
|
static int
|
|
saveit (int instatus, char *inkey, int inkeylen, char *inval,
|
|
int invallen, char *indata)
|
|
{
|
|
intern_t *intern = (intern_t *) indata;
|
|
|
|
if (instatus != YP_TRUE)
|
|
return instatus;
|
|
|
|
if (inkey && inkeylen > 0 && inval && invallen > 0)
|
|
{
|
|
if (intern->start == NULL)
|
|
{
|
|
intern->start = malloc (sizeof (struct response_t));
|
|
intern->next = intern->start;
|
|
}
|
|
else
|
|
{
|
|
intern->next->next = malloc (sizeof (struct response_t));
|
|
intern->next = intern->next->next;
|
|
}
|
|
intern->next->next = NULL;
|
|
intern->next->val = malloc (invallen + 1);
|
|
strncpy (intern->next->val, inval, invallen);
|
|
intern->next->val[invallen] = '\0';
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_setservent (intern_t *intern)
|
|
{
|
|
char *domainname;
|
|
struct ypall_callback ypcb;
|
|
enum nss_status status;
|
|
|
|
if (yp_get_default_domain (&domainname))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
while (intern->start != NULL)
|
|
{
|
|
if (intern->start->val != NULL)
|
|
free (intern->start->val);
|
|
intern->next = intern->start;
|
|
intern->start = intern->start->next;
|
|
free (intern->next);
|
|
}
|
|
intern->start = NULL;
|
|
|
|
ypcb.foreach = saveit;
|
|
ypcb.data = (char *) intern;
|
|
status = yperr2nss (yp_all (domainname, "services.byname", &ypcb));
|
|
intern->next = intern->start;
|
|
|
|
return status;
|
|
}
|
|
enum nss_status
|
|
_nss_nis_setservent (void)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_setservent (&intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_endservent (intern_t * intern)
|
|
{
|
|
while (intern->start != NULL)
|
|
{
|
|
if (intern->start->val != NULL)
|
|
free (intern->start->val);
|
|
intern->next = intern->start;
|
|
intern->start = intern->start->next;
|
|
free (intern->next);
|
|
}
|
|
intern->start = NULL;
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_endservent (void)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_endservent (&intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_getservent_r (struct servent *serv, char *buffer,
|
|
size_t buflen, int *errnop, intern_t *data)
|
|
{
|
|
struct parser_data *pdata = (void *) buffer;
|
|
int parse_res;
|
|
char *p;
|
|
|
|
if (data->start == NULL)
|
|
internal_nis_setservent (data);
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
do
|
|
{
|
|
if (data->next == NULL)
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
p = strncpy (buffer, data->next->val, buflen);
|
|
while (isspace (*p))
|
|
++p;
|
|
|
|
parse_res = _nss_files_parse_servent (p, serv, pdata, buflen, errnop);
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
data->next = data->next->next;
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservent_r (struct servent *serv, char *buffer, size_t buflen,
|
|
int *errnop)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_getservent_r (serv, buffer, buflen, errnop, &intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservbyname_r (const char *name, char *protocol,
|
|
struct servent *serv, char *buffer, size_t buflen,
|
|
int *errnop)
|
|
{
|
|
intern_t data = { NULL, NULL };
|
|
enum nss_status status;
|
|
int found;
|
|
|
|
if (name == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
/* If the protocol is given, we could try if our NIS server knows
|
|
about services.byservicename map. If yes, we only need one query */
|
|
if (protocol != NULL)
|
|
{
|
|
char key[strlen (name) + strlen (protocol) + 2];
|
|
char *cp, *domain, *result;
|
|
size_t keylen, len;
|
|
|
|
/* If this fails, the other solution will also fail. */
|
|
if (yp_get_default_domain (&domain))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
/* key is: "name/protocol" */
|
|
cp = stpcpy (key, name);
|
|
*cp++ = '/';
|
|
stpcpy (cp, protocol);
|
|
keylen = strlen (key);
|
|
status = yperr2nss (yp_match (domain, "services.byservicename", key,
|
|
keylen, &result, &len));
|
|
|
|
/* If we found the key, it's ok and parse the result. If not,
|
|
fall through and parse the complete table. */
|
|
if (status == NSS_STATUS_SUCCESS)
|
|
{
|
|
struct parser_data *pdata = (void *) buffer;
|
|
int parse_res;
|
|
char *p;
|
|
|
|
if ((size_t) (len + 1) > buflen)
|
|
{
|
|
free (result);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
p = strncpy (buffer, result, len);
|
|
buffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
parse_res = _nss_files_parse_servent (p, serv, pdata,
|
|
buflen, errnop);
|
|
if (parse_res < 0)
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
else
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
}
|
|
else
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
status = internal_nis_setservent (&data);
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
|
|
found = 0;
|
|
while (!found &&
|
|
((status = internal_nis_getservent_r (serv, buffer, buflen, errnop,
|
|
&data)) == NSS_STATUS_SUCCESS))
|
|
{
|
|
if (protocol == NULL || strcmp (serv->s_proto, protocol) == 0)
|
|
{
|
|
char **cp;
|
|
|
|
if (strcmp (serv->s_name, name) == 0)
|
|
found = 1;
|
|
else
|
|
for (cp = serv->s_aliases; *cp; cp++)
|
|
if (strcmp (name, *cp) == 0)
|
|
found = 1;
|
|
}
|
|
}
|
|
|
|
internal_nis_endservent (&data);
|
|
|
|
if (!found && status == NSS_STATUS_SUCCESS)
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservbyport_r (int port, char *protocol, struct servent *serv,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
intern_t data = { NULL, NULL };
|
|
enum nss_status status;
|
|
int found;
|
|
|
|
/* If the protocol is given, we only need one query */
|
|
if (protocol != NULL)
|
|
{
|
|
char key[100 + strlen (protocol) + 2];
|
|
char *domain, *result;
|
|
size_t keylen, len;
|
|
|
|
/* If this fails, the other solution will also fail. */
|
|
if (yp_get_default_domain (&domain))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
/* key is: "port/protocol" */
|
|
keylen = snprintf (key, sizeof (key), "%d/%s", port, protocol);
|
|
status = yperr2nss (yp_match (domain, "services.byname", key,
|
|
keylen, &result, &len));
|
|
|
|
/* If we found the key, it's ok and parse the result. If not,
|
|
fall through and parse the complete table. */
|
|
if (status == NSS_STATUS_SUCCESS)
|
|
{
|
|
struct parser_data *pdata = (void *) buffer;
|
|
int parse_res;
|
|
char *p;
|
|
|
|
if ((size_t) (len + 1) > buflen)
|
|
{
|
|
free (result);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
p = strncpy (buffer, result, len);
|
|
buffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
parse_res = _nss_files_parse_servent (p, serv, pdata,
|
|
buflen, errnop);
|
|
if (parse_res < 0)
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
else
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
}
|
|
else
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
status = internal_nis_setservent (&data);
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
|
|
found = 0;
|
|
while (!found &&
|
|
((status = internal_nis_getservent_r (serv, buffer, buflen, errnop,
|
|
&data)) == NSS_STATUS_SUCCESS))
|
|
if (serv->s_port == port &&
|
|
(protocol == NULL || strcmp (serv->s_proto, protocol) == 0))
|
|
found = 1;
|
|
|
|
internal_nis_endservent (&data);
|
|
|
|
if (!found && status == NSS_STATUS_SUCCESS)
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
return status;
|
|
}
|