mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 17:11:06 +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.
289 lines
6.4 KiB
C
289 lines
6.4 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@vt.uni-paderborn.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 <errno.h>
|
|
#include <string.h>
|
|
#include <aliases.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
|
|
#include "nss-nis.h"
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
static bool_t new_start = 1;
|
|
static char *oldkey = NULL;
|
|
static int oldkeylen = 0;
|
|
|
|
static int
|
|
_nss_nis_parse_aliasent (const char *key, char *alias, struct aliasent *result,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
char *first_unused = buffer + strlen (alias) + 1;
|
|
size_t room_left =
|
|
buflen - (buflen % __alignof__ (char *)) - strlen (alias) - 2;
|
|
char *line;
|
|
char *cp;
|
|
|
|
result->alias_members_len = 0;
|
|
*first_unused = '\0';
|
|
first_unused++;
|
|
strcpy (first_unused, key);
|
|
|
|
if (first_unused[room_left - 1] != '\0')
|
|
{
|
|
/* The line is too long for our buffer. */
|
|
no_more_room:
|
|
*errnop = ERANGE;
|
|
return -1;
|
|
}
|
|
|
|
result->alias_name = first_unused;
|
|
|
|
/* Terminate the line for any case. */
|
|
cp = strpbrk (alias, "#\n");
|
|
if (cp != NULL)
|
|
*cp = '\0';
|
|
|
|
first_unused += strlen (result->alias_name) + 1;
|
|
/* Adjust the pointer so it is aligned for
|
|
storing pointers. */
|
|
first_unused += __alignof__ (char *) - 1;
|
|
first_unused -= ((first_unused - (char *) 0) % __alignof__ (char *));
|
|
result->alias_members = (char **) first_unused;
|
|
|
|
line = alias;
|
|
|
|
while (*line != '\0')
|
|
{
|
|
/* Skip leading blanks. */
|
|
while (isspace (*line))
|
|
line++;
|
|
|
|
if (*line == '\0')
|
|
break;
|
|
|
|
if (room_left < sizeof (char *))
|
|
goto no_more_room;
|
|
room_left -= sizeof (char *);
|
|
result->alias_members[result->alias_members_len] = line;
|
|
|
|
while (*line != '\0' && *line != ',')
|
|
line++;
|
|
|
|
if (line != result->alias_members[result->alias_members_len])
|
|
{
|
|
*line = '\0';
|
|
line++;
|
|
result->alias_members_len++;
|
|
}
|
|
}
|
|
return result->alias_members_len == 0 ? 0 : 1;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_setaliasent (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_endaliasent (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;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_getaliasent_r (struct aliasent *alias, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
char *domain;
|
|
char *result;
|
|
int len;
|
|
char *outkey;
|
|
int keylen;
|
|
char *p;
|
|
int parse_res;
|
|
|
|
if (yp_get_default_domain (&domain))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
alias->alias_local = 0;
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
do
|
|
{
|
|
enum nss_status retval;
|
|
|
|
if (new_start)
|
|
retval = yperr2nss (yp_first (domain, "mail.aliases",
|
|
&outkey, &keylen, &result, &len));
|
|
else
|
|
retval = yperr2nss ( yp_next (domain, "mail.aliases", oldkey,
|
|
oldkeylen, &outkey, &keylen,
|
|
&result, &len));
|
|
if (retval != NSS_STATUS_SUCCESS)
|
|
{
|
|
if (retval == NSS_STATUS_NOTFOUND)
|
|
*errnop = ENOENT;
|
|
else if (retval == NSS_STATUS_TRYAGAIN)
|
|
*errnop = errno;
|
|
return retval;
|
|
}
|
|
|
|
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_nis_parse_aliasent (outkey, p, alias, buffer, buflen,
|
|
errnop);
|
|
if (parse_res == -1)
|
|
{
|
|
free (outkey);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
free (oldkey);
|
|
oldkey = outkey;
|
|
oldkeylen = keylen;
|
|
new_start = 0;
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getaliasent_r (struct aliasent *alias, char *buffer, size_t buflen,
|
|
int *errnop)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_getaliasent_r (alias, buffer, buflen, errnop);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getaliasbyname_r (const char *name, struct aliasent *alias,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
enum nss_status retval;
|
|
int parse_res;
|
|
char *domain;
|
|
char *result;
|
|
int len;
|
|
char *p;
|
|
size_t namlen = strlen (name);
|
|
char name2[namlen + 1];
|
|
int i;
|
|
|
|
if (name == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (yp_get_default_domain (&domain))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
/* Convert name to lowercase. */
|
|
for (i = 0; i < namlen; ++i)
|
|
name2[i] = _tolower (name[i]);
|
|
name2[i] = '\0';
|
|
|
|
retval = yperr2nss (yp_match (domain, "mail.aliases", name2, namlen,
|
|
&result, &len));
|
|
|
|
if (retval != NSS_STATUS_SUCCESS)
|
|
{
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
*errnop = errno;
|
|
return retval;
|
|
}
|
|
|
|
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);
|
|
|
|
alias->alias_local = 0;
|
|
parse_res = _nss_nis_parse_aliasent (name, p, alias, buffer, buflen, errnop);
|
|
if (parse_res < 1)
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
else
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|