mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-03 16:21:06 +00:00
2d7da676f3
1997-07-11 03:00 Ulrich Drepper <drepper@cygnus.com> * inet/inet_ntoa.c: Prevent looking for thread data key if we found one. * signal/sigandset.c: Include stddef.h to get NULL defined. * signal/sigisempty.c: Likewise. * signal/sigorset.c: Likewise. * sysdeps/stub/if_index.h: Likewise. * wcsmbs/wcstod_l.c: Include locale.h to get __locale_t defined. * wcsmbs/wcstof_l.c: Likewise. * wcsmbs/wcstol_l.c: Likewise. * wcsmbs/wcstold_l.c: Likewise. * wcsmbs/wcstoll_l.c: Likewise. * wcsmbs/wcstoul_l.c: Likewise. * wcsmbs/wcstoull_l.c: Likewise. Reported by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>. * stdio-common/snprintf.c: Use ISO C function definition form. * sysdeps/stub/libc-lock.h: Don't define __libc_key_create and __libc_setspecific as empty macros since they are used as function with return value. Reported by Andreas Jaeger. 1997-07-10 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu> * sysdeps/mach/hurd/select.c (__select): Need bit count for MACH_MSG_TYPE_INTEGER_T. 1997-07-08 10:12 Fila Kolodny <fila@ibi.com> * sysdeps/i370/Implies: New file for i370-ibm-mvs port. * sysdeps/mvs/Implies: Likewise. 1997-07-09 23:06 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/Makefile: Add new source files. * nis/nis_intern.h: Add new internal functions. * nis/rpcsvc/nislib.h: Likewise. * nis/lckcache.c: New. * nis/nis_cache.c: New, dummy functions in the moment. * nis/nis_util.c: New. * nis/nisplus-parser.h: New. * nis/nss_nisplus/nisplus-parser.c: New. * nis/rpcsvc/nis_cache.h: New. * nis/rpcsvc/nis_cache.x: New. * nis/nss_compat/compat-grp.c: Matches Solaris behaviour now. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/nss_nis/nis-publickey.c: Remove libc-lock.h include. * nis/nis_intern.c: Removed. * nis/nis_call.c: Complete rewrite. * nis/nis_lookup.c: Likewise. * nis/nis_table.c: Likewise. * nis/libnsl.map: Add missing symbols. * nis/nis_print.c: Fix nis_print_link. * nis/nis_subr.c: Fix nis_getnames. 1997-07-09 07:19 H.J. Lu <hjl@gnu.ai.mit.edu> * posix/execvp.c (execvp): Handle ESTALE. 1997-07-10 13:54 Ulrich Drepper <drepper@cygnus.com> * posix/regex.c: Make CHAR_SET_SIZE definition always available, even if SYNTAX_TABLE is defined. Patch by Akim Demaille <demaille@inf.enst.fr>. 1997-07-09 08:16 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/fileops.c (_IO_file_underflow): Adjust pointers before calling _IO_SYSREAD (). 1997-07-07 22:54 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/sparc/divrem.m4: Eliminate use of "DEFS.h" (sysdep.h does the same job). * sysdeps/sparc/alloca.S: Likewise. * sysdeps/sparc/dotmul.S: Likewise. * sysdeps/sparc/udiv_qrnnd.S: Likewise. * sysdeps/sparc/rem.S: Regenerated. * sysdeps/sparc/sdiv.S: Regenerated. * sysdeps/sparc/udiv.S: Regenerated. * sysdeps/sparc/urem.S: Regenerated. * sysdeps/sparc/DEFS.h: Removed. * sysdeps/sparc/elf/DEFS.h: Removed. * sysdeps/sparc/Dist: Don't distribute DEFS.h. * sysdeps/unix/sparc/sysdep.h: Use 4 byte alignment. Add .type directive #ifdef HAVE_ELF. Minor format changes. * sysdeps/alpha/DEFS.h: Removed. * sysdeps/alpha/Dist: Don't distribute DEFS.h. 1997-07-07 19:03 H.J. Lu <hjl@gnu.ai.mit.edu> * math/test-fenv.c (feenv_nomask_test): Move fesetenv (FE_NOMASK_ENV) after fork () to work with SMP. * sysdeps/i386/fpu_control.h (_FPU_IEEE): Fix comment. 1997-07-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add _IO_peekc_locked. 1997-07-07 15:45 Fila Kolodny <fila@ibi.com> * Makeconfig: Add dbobjdir to rpath-link analogous to nssobjdir. 1997-07-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/feholdexcpt.c: Shift the exception mask in the right position. * sysdeps/m68k/fpu/fesetenv.c (fesetenv): Likewise. 1997-07-08 13:59 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c (spaces, zeroes): Handle broken SGI compiler. Patch by Richard Stallman <rms@gnu.ai.mit.edu>.
228 lines
5.1 KiB
C
228 lines
5.1 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 <rpc/rpc.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
#if defined (HAVE_SECURE_RPC)
|
|
#include <rpc/key_prot.h>
|
|
extern int xdecrypt (char *, char *);
|
|
#endif
|
|
|
|
#include "nss-nis.h"
|
|
|
|
/* If we haven't 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)
|
|
{
|
|
#if defined (HAVE_SECURE_RPC)
|
|
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);
|
|
}
|
|
#else
|
|
skey[0] = 0;
|
|
#endif
|
|
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;
|
|
}
|