mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-16 18:10:11 +00:00
40a55d2054
1997-08-20 05:30 Ulrich Drepper <drepper@cygnus.com> * catgets/catgets.c (catclose): Use __munmap instead of munmap. * catgets/gencat.c (read_input_file): Fix typo. * dirent/dirent.h: Make seekdir and telldir available for __USE_XOPEN. * elf/dl-load.c: Fix case of missing DT_RPATH in object which gets executed (e.g., when it is a static binary). * intl/bindtextdomain.c: Use strdup in glibc. Correct comment. * intl/dcgettext.c: Likewise. * intl/dgettext.c: Likewise. * intl/explodename.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettext.c: Likewise. * intl/gettext.h: Likewise. * intl/hash-string.h: Likewise. * intl/l10nflist.c: Likewise. * intl/libintl.h: Likewise. * intl/loadinfo.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. Unify libio sources with code in libg++. * libio/fcloseall.c: Update and reformat copyright. Protect use of weak_alias. Use _IO_* thread macros instead of __libc_*. * libio/feof.c: Likewise. * libio/feof_u.c: Likewise. * libio/ferror.c: Likewise. * libio/ferror_u.c: Likewise. * libio/fgetc.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileno.c: Likewise. * libio/fileops.c: Likewise. * libio/fputc.c: Likewise. * libio/fputc_u.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/genops.c: Likewise. * libio/getc.c: Likewise. * libio/getc_u.c: Likewise. * libio/getchar.c: Likewise. * libio/getchar_u.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofprintf.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioputs.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/iosprintf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/obprintf.c: Likewise. * libio/pclose.c: Likewise. * libio/peekc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strfile.h: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * manual/libc.texinfo: Add menu entries for chapter on message translation. * manual/locale.texi: Correct next entry in @node for new chapter. * manual/search.texi: Likewise for previous link. * manual/message.texi: New file. * manual/startup.texi: Document LC_ALL, LC_MESSAGES, NLSPATH, setenv, unsetenv, and clearenv. * manual/string.texi: Fix typos. Patch by Jim Meyering. * math/Makefile (test-longdouble-yes): Enable. We want long double tests now. Crusade against strcat. * nis/nss_nisplus/nisplus-publickey.c: Remove uses of strcat. * stdlib/canonicalize.c: Likewise. * posix/glob.h: Define __const if necessary. Use __const in all prototypes. * sysdeps/generic/stpcpy.c: Use K&R form to allow use in other GNU packages. * posix/wordexp.c: Completely reworked buffer handling for much better performance. Patch by Tim Waugh. * socket/sys/sochet.h (getpeername): Fix type of LEN parameter, it must be socklen_t. * sysdeps/libm-i387/e_remainder.S: Pretty print. * sysdeps/libm-i387/e_remainderf.S: Likewise. * sysdeps/libm-i387/e_remainderl.S: Pop extra value for FPU stack. * sysdeps/libm-i387/s_cexp.S: Little optimization. * sysdeps/libm-i387/s_cexpl.S: Likewise. * sysdep/libm-ieee754/s_csinhl.c: Include <fenv.h>. 1997-08-18 15:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/if_index.c (if_nameindex): Fix memory leak in cleanup code. 1997-08-17 Paul Eggert <eggert@twinsun.com> * tzset.c (__tzset_internal): Fix memory leak when the user specifies a TZ value that uses a default rule file. Do not assume US DST rules when the user specifies that there is no DST. 1997-08-10 19:17 Philip Blundell <Philip.Blundell@pobox.com> * inet/getnameinfo.c: Tidy up. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0 if using stub code. (if_indextoname): Use SIOGIFNAME ioctl if the kernel supports it. (if_nameindex): Use alloca() rather than malloc(); use SIOCGIFCOUNT ioctl if the kernel supports it. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/sys/mount.h: Remove the IS_* macros, they operate on internal kernel structures and have no place in a user header. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (lib%.so): Depend on $(+preinit) and $(+postinit). (build-shlib): Filter them out of $^. 1997-08-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-error.c (_dl_signal_error): Fix error message. 1997-08-16 04:06 Ulrich Drepper <drepper@cygnus.com> * assert/assert.h [__USE_GNU]: Undefine assert_perror. Reported by Theodore C. Belding <Ted.Belding@umich.edu>. 1997-08-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Change object suffixes from *.[spgb]o to *.o[spgb] to avoid conflict with PO files. * Makerules: Likewise. * Rules: Likewise. * elf/Makefile: Likewise. * extra-lib.mk: Likewise. * gmon/Makefile: Likewise. * nis/Makefile: Likewise. * nss/Makefile: Likewise. * resolv/Makefile: Likewise. * rpm/Makefile: Likewise. * sunrpc/Makefile: Likewise. * sysdeps/sparc/elf/Makefile: Likewise. * sysdeps/sparc64/elf/Makefile: Likewise. * sysdeps/unix/sysv/linux/sparc/Makefile: Likewise. (ASFLAGS-.os): Renamed from as-FLAGS.os.
372 lines
9.3 KiB
C
372 lines
9.3 KiB
C
/* Copyright (c) 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
|
|
|
|
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 <stdio.h>
|
|
#include <string.h>
|
|
#include <syslog.h>
|
|
#include <rpc/rpc.h>
|
|
#include <rpcsvc/nis.h>
|
|
#ifdef HAVE_SECURE_RPC
|
|
#include <rpc/key_prot.h>
|
|
extern int xdecrypt (char *, char *);
|
|
#endif
|
|
|
|
#include <nss-nisplus.h>
|
|
|
|
/* If we haven't found the entry, we give a SUCCESS and an empty key back. */
|
|
enum nss_status
|
|
_nss_nisplus_getpublickey (const char *netname, char *pkey)
|
|
{
|
|
nis_result *res;
|
|
enum nss_status retval;
|
|
char buf[NIS_MAXNAMELEN+2];
|
|
size_t slen;
|
|
char *domain, *cptr;
|
|
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++;
|
|
|
|
slen = snprintf (buf, NIS_MAXNAMELEN,
|
|
"[auth_name=%s,auth_type=DES],cred.org_dir.%s",
|
|
netname, domain);
|
|
|
|
if (buf[slen - 1] != '.')
|
|
{
|
|
buf[slen++] = '.';
|
|
buf[slen] = '\0';
|
|
}
|
|
|
|
res = nis_list (buf, USE_DGRAM+NO_AUTHINFO+FOLLOW_LINKS+FOLLOW_PATH,
|
|
NULL, NULL);
|
|
|
|
retval = niserr2nss (res->status);
|
|
|
|
if (retval != NSS_STATUS_SUCCESS)
|
|
{
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
__set_errno (EAGAIN);
|
|
if (res->status == NIS_NOTFOUND)
|
|
retval = NSS_STATUS_SUCCESS;
|
|
nis_freeresult (res);
|
|
return retval;
|
|
}
|
|
|
|
if (res->objects.objects_len > 1)
|
|
{
|
|
/*
|
|
* More than one principal with same uid?
|
|
* something wrong with cred table. Should be unique
|
|
* Warn user and continue.
|
|
*/
|
|
printf (_("DES entry for netname %s not unique\n"), netname);
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
len = ENTRY_LEN (res->objects.objects_val, 3);
|
|
memcpy (pkey, ENTRY_VAL (res->objects.objects_val,3), len);
|
|
pkey[len] = 0;
|
|
cptr = strchr (pkey, ':');
|
|
if (cptr)
|
|
cptr[0] = '\0';
|
|
nis_freeresult (res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_getsecretkey (const char *netname, char *skey, char *passwd)
|
|
{
|
|
#ifdef HAVE_SECURE_RPC
|
|
nis_result *res;
|
|
enum nss_status retval;
|
|
char buf[NIS_MAXNAMELEN+2];
|
|
size_t slen;
|
|
char *domain, *cptr;
|
|
int len;
|
|
|
|
skey[0] = 0;
|
|
|
|
if (netname == NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
domain = strchr (netname, '@');
|
|
if (!domain)
|
|
return NSS_STATUS_UNAVAIL;
|
|
domain++;
|
|
|
|
slen = snprintf (buf, NIS_MAXNAMELEN,
|
|
"[auth_name=%s,auth_type=DES],cred.org_dir.%s",
|
|
netname, domain);
|
|
|
|
if (buf[slen - 1] != '.')
|
|
{
|
|
buf[slen++] = '.';
|
|
buf[slen] = '\0';
|
|
}
|
|
|
|
res = nis_list (buf, USE_DGRAM+NO_AUTHINFO+FOLLOW_LINKS+FOLLOW_PATH,
|
|
NULL, NULL);
|
|
|
|
retval = niserr2nss (res->status);
|
|
|
|
if (retval != NSS_STATUS_SUCCESS)
|
|
{
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
__set_errno (EAGAIN);
|
|
nis_freeresult (res);
|
|
return retval;
|
|
}
|
|
|
|
if (res->objects.objects_len > 1)
|
|
{
|
|
/*
|
|
* More than one principal with same uid?
|
|
* something wrong with cred table. Should be unique
|
|
* Warn user and continue.
|
|
*/
|
|
printf (_("DES entry for netname %s not unique\n"), netname);
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
len = ENTRY_LEN (res->objects.objects_val, 4);
|
|
memcpy (buf, ENTRY_VAL (res->objects.objects_val,4), len);
|
|
skey[len] = 0;
|
|
cptr = strchr (skey, ':');
|
|
if (cptr)
|
|
cptr[0] = '\0';
|
|
nis_freeresult (res);
|
|
|
|
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 information from the passed string.
|
|
The format of the string passed is gid,grp,grp, ... */
|
|
static enum nss_status
|
|
parse_grp_str (const char *s, gid_t *gidp, int *gidlenp, gid_t *gidlist)
|
|
{
|
|
int gidlen;
|
|
|
|
if (!s || (!isdigit (*s)))
|
|
{
|
|
syslog (LOG_ERR, _("netname2user: missing group id list in '%s'."), s);
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
*gidp = atoi (s);
|
|
|
|
gidlen = 0;
|
|
|
|
while ((s = strchr (s, ',')) != NULL)
|
|
{
|
|
s++;
|
|
gidlist[gidlen++] = atoi (s);
|
|
}
|
|
*gidlenp = gidlen;
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_netname2user (char netname[MAXNETNAMELEN + 1], uid_t *uidp,
|
|
gid_t *gidp, int *gidlenp, gid_t *gidlist)
|
|
{
|
|
char *domain;
|
|
nis_result *res;
|
|
char sname[NIS_MAXNAMELEN+1]; /* search criteria + table name */
|
|
size_t slen;
|
|
char principal[NIS_MAXNAMELEN+1];
|
|
int len;
|
|
|
|
/* 1. Get home domain of user. */
|
|
domain = strchr (netname, '@');
|
|
if (! domain)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
domain++; /* skip '@' */
|
|
|
|
/* 2. Get user's nisplus principal name. */
|
|
if ((strlen (netname) + strlen (domain)+45) >
|
|
(size_t) NIS_MAXNAMELEN)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
slen = snprintf (sname, NIS_MAXNAMELEN,
|
|
"[auth_name=%s,auth_type=DES],cred.org_dir.%s",
|
|
netname, domain);
|
|
|
|
if (sname[slen - 1] != '.')
|
|
{
|
|
sname[slen++] = '.';
|
|
sname[slen] = '\0';
|
|
}
|
|
|
|
/* must use authenticated call here */
|
|
/* XXX but we cant, for now. XXX */
|
|
res = nis_list (sname, USE_DGRAM+NO_AUTHINFO+FOLLOW_LINKS+FOLLOW_PATH,
|
|
NULL, NULL);
|
|
switch (res->status)
|
|
{
|
|
case NIS_SUCCESS:
|
|
case NIS_S_SUCCESS:
|
|
break; /* go and do something useful */
|
|
case NIS_NOTFOUND:
|
|
case NIS_PARTIAL:
|
|
case NIS_NOSUCHNAME:
|
|
case NIS_NOSUCHTABLE:
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_NOTFOUND;
|
|
case NIS_S_NOTFOUND:
|
|
case NIS_TRYAGAIN:
|
|
syslog (LOG_ERR, _("netname2user: (nis+ lookup): %s\n"),
|
|
nis_sperrno (res->status));
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
default:
|
|
syslog (LOG_ERR, _("netname2user: (nis+ lookup): %s\n"),
|
|
nis_sperrno (res->status));
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (res->objects.objects_len > 1)
|
|
{
|
|
/*
|
|
* A netname belonging to more than one principal?
|
|
* Something wrong with cred table. should be unique.
|
|
* Warn user and continue.
|
|
*/
|
|
syslog (LOG_ALERT,
|
|
_("netname2user: DES entry for %s in directory %s not unique"),
|
|
netname, domain);
|
|
}
|
|
|
|
len = ENTRY_LEN (res->objects.objects_val, 0);
|
|
strncpy (principal, ENTRY_VAL (res->objects.objects_val, 0), len);
|
|
principal[len] = '\0';
|
|
nis_freeresult (res);
|
|
|
|
if (principal[0] == '\0')
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
/*
|
|
* 3. Use principal name to look up uid/gid information in
|
|
* LOCAL entry in **local** cred table.
|
|
*/
|
|
domain = nis_local_directory ();
|
|
if ((strlen (principal) + strlen (domain) + 45) > (size_t) NIS_MAXNAMELEN)
|
|
{
|
|
syslog (LOG_ERR, _("netname2user: principal name '%s' too long"),
|
|
principal);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
slen = sprintf (sname, "[cname=%s,auth_type=LOCAL],cred.org_dir.%s",
|
|
principal, domain);
|
|
|
|
if (sname[slen - 1] != '.')
|
|
{
|
|
sname[slen++] = '.';
|
|
sname[slen] = '\0';
|
|
}
|
|
|
|
/* must use authenticated call here */
|
|
/* XXX but we cant, for now. XXX */
|
|
res = nis_list (sname, USE_DGRAM+NO_AUTHINFO+FOLLOW_LINKS+FOLLOW_PATH,
|
|
NULL, NULL);
|
|
switch(res->status)
|
|
{
|
|
case NIS_NOTFOUND:
|
|
case NIS_PARTIAL:
|
|
case NIS_NOSUCHNAME:
|
|
case NIS_NOSUCHTABLE:
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_NOTFOUND;
|
|
case NIS_S_NOTFOUND:
|
|
case NIS_TRYAGAIN:
|
|
syslog (LOG_ERR, _("netname2user: (nis+ lookup): %s\n"),
|
|
nis_sperrno (res->status));
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
case NIS_SUCCESS:
|
|
case NIS_S_SUCCESS:
|
|
break; /* go and do something useful */
|
|
default:
|
|
syslog (LOG_ERR, _("netname2user: (nis+ lookup): %s\n"),
|
|
nis_sperrno (res->status));
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (res->objects.objects_len > 1)
|
|
{
|
|
/*
|
|
* A principal can have more than one LOCAL entry?
|
|
* Something wrong with cred table.
|
|
* Warn user and continue.
|
|
*/
|
|
syslog (LOG_ALERT,
|
|
_("netname2user: LOCAL entry for %s in directory %s not unique"),
|
|
netname, domain);
|
|
}
|
|
/* Fetch the uid */
|
|
*uidp = atoi (ENTRY_VAL (res->objects.objects_val, 2));
|
|
|
|
if (*uidp == 0)
|
|
{
|
|
syslog (LOG_ERR, _("netname2user: should not have uid 0"));
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
parse_grp_str (ENTRY_VAL (res->objects.objects_val, 3),
|
|
gidp, gidlenp, gidlist);
|
|
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|