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.
244 lines
5.6 KiB
C
244 lines
5.6 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 <errno.h>
|
|
#include <string.h>
|
|
#include <syslog.h>
|
|
#include <rpc/rpc.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
#include <rpc/key_prot.h>
|
|
extern int xdecrypt (char *, char *);
|
|
|
|
#include "nss-nis.h"
|
|
|
|
/* If we haven't found the entry, we give a SUCCESS and an empty key back.
|
|
Solaris docu says: sizeof (pkey) == HEXKEYBYTES + 1.
|
|
*/
|
|
enum nss_status
|
|
_nss_nis_getpublickey (const char *netname, char *pkey, int *errnop)
|
|
{
|
|
enum nss_status retval;
|
|
char *domain, *result;
|
|
int len;
|
|
|
|
pkey[0] = 0;
|
|
|
|
if (netname == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
domain = strchr (netname, '@');
|
|
if (!domain)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
++domain;
|
|
|
|
retval = yperr2nss (yp_match (domain, "publickey.byname", netname,
|
|
strlen (netname), &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 (result != NULL)
|
|
{
|
|
char *p = strchr (result, ':');
|
|
if (p != NULL)
|
|
*p = 0;
|
|
strncpy (pkey, result, HEXKEYBYTES + 1);
|
|
pkey[HEXKEYBYTES] = '\0';
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getsecretkey (const char *netname, char *skey, char *passwd,
|
|
int *errnop)
|
|
{
|
|
enum nss_status retval;
|
|
char buf[2 * (HEXKEYBYTES + 1)];
|
|
char *domain, *result;
|
|
int len;
|
|
|
|
skey[0] = 0;
|
|
|
|
if (netname == NULL || passwd == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
domain = strchr (netname, '@');
|
|
if (!domain)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
++domain;
|
|
|
|
retval = yperr2nss (yp_match (domain, "publickey.byname", netname,
|
|
strlen (netname), &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 (result != NULL)
|
|
{
|
|
char *p = strchr (result, ':');
|
|
if (p == NULL)
|
|
return NSS_STATUS_SUCCESS;
|
|
|
|
++p;
|
|
strncpy (buf, p, 2 * (HEXKEYBYTES + 1));
|
|
buf[2 * (HEXKEYBYTES + 1)] = '\0';
|
|
if (!xdecrypt (buf, passwd))
|
|
return NSS_STATUS_SUCCESS;
|
|
|
|
if (memcmp (buf, &(buf[HEXKEYBYTES]), KEYCHECKSUMSIZE) != 0)
|
|
return NSS_STATUS_SUCCESS;
|
|
|
|
buf[HEXKEYBYTES] = '\0';
|
|
strcpy (skey, buf);
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
/* Parse uid and group information from the passed string.
|
|
The format of the string passed is uid:gid,grp,grp, ... */
|
|
static enum nss_status
|
|
parse_netid_str (const char *s, uid_t *uidp, gid_t *gidp, int *gidlenp,
|
|
gid_t *gidlist)
|
|
{
|
|
char *p;
|
|
int gidlen;
|
|
|
|
if (!s || !isdigit (*s))
|
|
{
|
|
syslog (LOG_ERR, "netname2user: expecting uid '%s'", s);
|
|
return NSS_STATUS_NOTFOUND; /* XXX need a better error */
|
|
}
|
|
|
|
/* Fetch the uid */
|
|
*uidp = (atoi (s));
|
|
|
|
if (*uidp == 0)
|
|
{
|
|
syslog (LOG_ERR, "netname2user: should not have uid 0");
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
/* Now get the group list */
|
|
p = strchr (s, ':');
|
|
if (!p)
|
|
{
|
|
syslog (LOG_ERR, "netname2user: missing group id list in '%s'", s);
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
++p; /* skip ':' */
|
|
if (!p || (!isdigit (*p)))
|
|
{
|
|
syslog (LOG_ERR, "netname2user: missing group id list in '%s'.", p);
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
*gidp = (atoi (p));
|
|
|
|
gidlen = 0;
|
|
|
|
while ((p = strchr (p, ',')) != NULL)
|
|
{
|
|
p++;
|
|
gidlist[gidlen++] = atoi (p);
|
|
}
|
|
|
|
*gidlenp = gidlen;
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
|
|
enum nss_status
|
|
_nss_nis_netname2user (char netname[MAXNETNAMELEN + 1], uid_t *uidp,
|
|
gid_t *gidp, int *gidlenp, gid_t *gidlist, int *errnop)
|
|
{
|
|
char *domain;
|
|
int yperr;
|
|
char *lookup;
|
|
int len;
|
|
|
|
domain = strchr (netname, '@');
|
|
if (!domain)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
/* Point past the '@' character */
|
|
++domain;
|
|
lookup = NULL;
|
|
yperr = yp_match (domain, "netid.byname", netname, strlen (netname),
|
|
&lookup, &len);
|
|
switch (yperr)
|
|
{
|
|
case YPERR_SUCCESS:
|
|
break; /* the successful case */
|
|
case YPERR_DOMAIN:
|
|
case YPERR_KEY:
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
case YPERR_MAP:
|
|
default:
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (lookup)
|
|
{
|
|
enum nss_status err;
|
|
|
|
lookup[len] = '\0';
|
|
err = parse_netid_str (lookup, uidp, gidp, gidlenp, gidlist);
|
|
free (lookup);
|
|
return err;
|
|
}
|
|
else
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|