mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
f166d86530
1997-03-09 06:59 Ulrich Drepper <drepper@cygnus.com> * Makeconfig: Add ASFLAGS-% flags for SPARC assembler which need -fPIC. * Makerules (compile.S): Use ASFLAGS-%. (COMPILE.S): Likewise. * config.make.in (ASFLAGS-.so): Define from ASFLAGS_SO. * configure.in: Substitute ASFLAGS_SO. * sysdeps/sparc/configure.in: New file. * posix/unitstd.h: Add prototype for __euidaccess. * sysdeps/posix/euidaccess.c: Define as __euidaccess and make euidaccess weak alias. * sysdeps/stubs/euidaccess.c: Likewise. * inet/rcmd.c: Use __ protected versions of non-standard functions. * locale/setlocale.c (setlocale): Don't set usage_count to MAX_USAGE_COUNT if it already has this value. * locale/programs/localedef.c: Don't use LOCALE_PATH to find binary locale files. Use LOCALEDIR only. * locale/programs/locfile.c: When named file not found and not absolute use path in I18NPATH. * stdlib/Makefile (headers): Add inttypes.h. * sysdpes/generic/socketbits.h: Add PF_FILE as synonym for PF_LOCAL and AF_FILE as synonym for AF_LOCAL. * sysdpes/unix/sysv/linux/socketbits.h: Likewise. * time/Makefile: Rewrite rules for test to handle parallel builds. 1997-03-09 05:26 Ulrich Drepper <drepper@cygnus.com> * manual/startup.texi (EXIT_FAILURE): Fix typo. Patch by robbe@orcus.priv.at. 1997-03-09 05:10 Edward Seidl <seidl@janed.com> * sysdeps/i386/elf/start.S (nofini): *Really* align stack to 8-byte boundary. 1997-03-09 01:48 Ulrich Drepper <drepper@cygnus.com> * elf/link.h: Define __need_NULL to get definition. Include <features.h>. Patch by Andreas Jaeger <aj@arthur.pfalz.de>. 1997-03-08 21:48 Thorsten Kukuk <kukuk@tk.uni-paderborn.de> Rewrite NIS code to allow empty keys. * nis/nss_nis/nis-ethers.c: Rewritten. * nis/nss_nis/nis-proto.c: Rewritten. * nis/nss_nis/nis-publickey.c: Rewritten. * nis/nss_nis/nis-rpc.c: Rewritten. * nis/nss_nis/nis-service.c: Rewritten. 1997-03-08 16:02 Andreas Jaeger <aj@arthur.pfalz.de> * time/scheck.c (scheck): Add extra const to second argument. * time/private.h: Correct prototypes to match definition. 1997-03-08 18:55 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/__math.h: Remove cabs inline definition. Reported by Philip Blundell <pjb27@cam.ac.uk>. Reported by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>. Bug report by Andreas Jaeger <jaeger@informatik.uni-kl.de>.
223 lines
5.0 KiB
C
223 lines
5.0 KiB
C
/* Copyright (C) 1996, 1997 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 <syslog.h>
|
|
#include <libc-lock.h>
|
|
#include <rpc/key_prot.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
|
|
#include "nss-nis.h"
|
|
|
|
extern int xdecrypt (char *, char *);
|
|
|
|
/* If we found the entry, we give a SUCCESS and an empty key back. */
|
|
enum nss_status
|
|
_nss_nis_getpublickey (const char *netname, char *pkey)
|
|
{
|
|
enum nss_status retval;
|
|
char *domain, *result;
|
|
int len;
|
|
|
|
pkey[0] = 0;
|
|
|
|
if (netname == NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
domain = strchr (netname, '@');
|
|
if (!domain)
|
|
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_TRYAGAIN)
|
|
__set_errno (EAGAIN);
|
|
return retval;
|
|
}
|
|
|
|
if (result != NULL)
|
|
{
|
|
char *p = strchr (result, ':');
|
|
if (p != NULL)
|
|
*p = 0;
|
|
strcpy (pkey, result);
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getsecretkey (const char *netname, char *skey, char *passwd)
|
|
{
|
|
enum nss_status retval;
|
|
char buf[1024];
|
|
char *domain, *result;
|
|
int len;
|
|
|
|
skey[0] = 0;
|
|
|
|
if (netname == NULL || passwd == NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
domain = strchr (netname, '@');
|
|
if (!domain)
|
|
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_TRYAGAIN)
|
|
__set_errno (EAGAIN);
|
|
return retval;
|
|
}
|
|
|
|
if (result != NULL)
|
|
{
|
|
char *p = strchr (result, ':');
|
|
if (p == NULL)
|
|
return NSS_STATUS_SUCCESS;
|
|
|
|
p++;
|
|
strcpy (buf, p);
|
|
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)
|
|
{
|
|
char *domain;
|
|
int yperr;
|
|
char *lookup;
|
|
int len;
|
|
|
|
domain = strchr (netname, '@');
|
|
if (!domain)
|
|
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:
|
|
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
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|