6591c33562
1998-01-30 19:58 Ulrich Drepper <drepper@cygnus.com> * include/cpio.h: Move to ... * posix/cpio.h: ...here. * locale/programs/ld-collate.c: Fix typo. * signal/signal.h: Declare _sys_siglist with NSIG+1 elements. * stdio-common/tiformat.c: Add checks for %#.0o and friends. * login/utmp_file.c (pututline_file): Don't always report success if similar entry is found. Patch by Mark M. Kettenis. 1998-01-30 16:06 Philip Blundell <pb@nexus.co.uk> * manual/Makefile: Don't try to install the info files if makeinfo is not available. 1998-01-30 12:05 Philip Blundell <pb@nexus.co.uk> * sysdeps/unix/sysv/linux/bits/ioctls.h: Include a copy of the kernel's network ioctls, rather than using <linux/sockios.h> to get them. This way we are sure of maintaining compatibility if the kernel interface should change. 1998-01-30 15:52 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/Dist: Add netrose/rose.h. 1998-01-25 19:54 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/netrose/rose.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Install it. 1998-01-27 22:29 Zack Weinberg <zack@rabi.phys.columbia.edu> Implement System V pseudoterminal handling. * login/Makefile (routines): Add getpt, grantpt, unlockpt, ptsname. (libutil-routines): Remove pty. Add openpty, forkpty. (distribute): New internal header pty-internal.h. (others): Add the helper program, pt_chown. (install-others): Install it, in $(libexecdir), mode 4755. * login/pty-internal.h: New file. * login/openpty.c: New file. * login/forkpty.c: New file. * login/programs/pt_chown.c: New file. * libc.map: Add getpt, grantpt, unlockpt, ptsname, ptsname_r. * stdlib/stdlib.h: Prototype them. * config.make.in: Define $(libexecdir). * Makeconfig: Define $(inst_libexecdir). * sysdeps/generic/pty.c: Removed. * sysdeps/unix/sysv/linux/pty.c: Removed. * sysdeps/generic/getpt.c: Stub out. * sysdeps/generic/grantpt.c: Likewise. * sysdeps/generic/ptsname.c: Likewise. * sysdeps/generic/unlockpt.c: Likewise. * sysdeps/unix/grantpt.c: New file. * sysdeps/unix/bsd/getpt.c: New file. * sysdeps/unix/bsd/unlockpt.c: New file. * sysdeps/unix/sysv/linux/getpt.c: New file. * sysdeps/unix/sysv/linux/ptsname.c: New file. * sysdeps/unix/sysv/linux/unlockpt.c: New file. 1998-01-29 23:56 Ulrich Drepper <drepper@cygnus.com> * localedata/locales/ru_RU: Fix YESEXPR. Patch by lav@yars.free.net. 1998-01-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/Makefile (tests): Add rule for test-netdb.c. * nss/test-netdb.c: New file. 1998-01-29 02:38 Ulrich Drepper <drepper@cygnus.com> * elf/dl-open.c (_dl_open): Make sure the variable `reloc' is really kept as a variable. Patch by Richard Henderson, reported by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>. * elf/rtld.c (dl_main): Call _dl_init_paths before handling preloading. * elf/genrtldtbl.awk: Mark machine dependent directory of generated entries as not existing. 1998-01-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/vfprintf.c (process_arg): Fix printing of octal zero in alternate form with precision of zero, which must produce "0". Add braces to avoid ambiguous `else'. 1998-01-26 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: Fix memory leak and trailing null problem with strncpy. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/comapt-spwd.c: Likewise. 1998-01-28 Andreas Jaeger <aj@arthur.rhein-neckar.de> * assert/assert.h (assert_perror): Correct test for errnum. Patch by uch@nop.or.jp. [PR libc/437] 1997-12-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locales/pl_PL: Fix int_curr_symbol. 1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/nis_cache.c: Include <unistd.h> for declaration of close. 1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * stdio-common/test-popen.c: Include <errno.h>. * sysdeps/unix/sysv/linux/if_index.c: Include <unistd.h> for close. * inet/getnetgrent_r.c: Include <errno.h>. * db2/db/db_conv.c: Include <string.h> for memcpy. * gmon/bb_exit_func.c: Include <string.h> instead of <strings.h> so that memcpy is declared. * iconv/iconv_open.c: Include <stdlib.h> for alloca. * misc/init-misc.c: Remove unneeded inclusion of <errno.h>. 1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * pwd/fgetpwent_r.c (__fgetpwent_r): Correctly handle buffer overflow while reading line with fgets. * grp/fgetgrent_r.c (__fgetgrent_r): Likewise. 1998-01-27 00:46 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/bits/types.h (__ipc_pid_t): Change to unsigned short, not short. Reported by Andreas Jaeger. 1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/mips/syscalls.list: Correct typo (ccept->accept). * sysdeps/generic/inttypes.h: Fix spelling. 1998-01-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/arm/Dist: Add bits/mman.h. * sysdeps/unix/sysv/linux/alpha/Dist: Add net/route.h. 1998-01-27 00:30 Ulrich Drepper <drepper@cygnus.com> * stdio-common/printf.h (struct print_info): Add new bitfield is_char. * stdio-common/printf-parse.h (parse_one_spec): Fill in is_char field for hh modifier. * stdio-common/vfprint.c: Use is_char field and do not depend in is_short having the value 2. Bug reported by Andreas Jaeger. 1998-01-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libio/freopen.c (freopen): Call _IO_old_freopen only if defined PIC && DO_VERSIONING. 1998-01-24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Rules: Add rules for $(common-objpfx)dummy$o.
428 lines
11 KiB
C
428 lines
11 KiB
C
/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
|
||
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 <bits/libc-lock.h>
|
||
#include <errno.h>
|
||
#include <netdb.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include "netgroup.h"
|
||
#include "nsswitch.h"
|
||
|
||
|
||
/* Protect above variable against multiple uses at the same time. */
|
||
__libc_lock_define_initialized (static, lock)
|
||
|
||
/* This handle for the NSS data base is shared between all
|
||
set/get/endXXXent functions. */
|
||
static service_user *nip;
|
||
|
||
/* The whole information for the set/get/endnetgrent functions are
|
||
kept in this structure. */
|
||
static struct __netgrent dataset;
|
||
|
||
/* The lookup function for the first entry of this service. */
|
||
extern int __nss_netgroup_lookup (service_user **nip, const char *name,
|
||
void **fctp);
|
||
|
||
|
||
/* Set up NIP to run through the services. If ALL is zero, use NIP's
|
||
current location if it's not nil. Return nonzero if there are no
|
||
services (left). */
|
||
static enum nss_status
|
||
setup (void **fctp, const char *func_name, int all)
|
||
{
|
||
/* Remember the first service_entry, it's always the same. */
|
||
static service_user *startp = NULL;
|
||
int no_more;
|
||
|
||
if (startp == NULL)
|
||
{
|
||
no_more = __nss_netgroup_lookup (&nip, func_name, fctp);
|
||
startp = no_more ? (service_user *) -1 : nip;
|
||
}
|
||
else if (startp == (service_user *) -1)
|
||
/* No services at all. */
|
||
return 1;
|
||
else
|
||
{
|
||
if (all || !nip)
|
||
/* Reset to the beginning of the service list. */
|
||
nip = startp;
|
||
/* Look up the first function. */
|
||
no_more = __nss_lookup (&nip, func_name, fctp);
|
||
}
|
||
return no_more;
|
||
}
|
||
|
||
/* Free used memory. */
|
||
static void
|
||
free_memory (struct __netgrent *data)
|
||
{
|
||
while (data->known_groups != NULL)
|
||
{
|
||
struct name_list *tmp = data->known_groups;
|
||
data->known_groups = data->known_groups->next;
|
||
free ((void *) tmp->name);
|
||
free (tmp);
|
||
}
|
||
|
||
while (data->needed_groups != NULL)
|
||
{
|
||
struct name_list *tmp = data->needed_groups;
|
||
data->needed_groups = data->needed_groups->next;
|
||
free ((void *) tmp->name);
|
||
free (tmp);
|
||
}
|
||
}
|
||
|
||
static int
|
||
internal_function
|
||
__internal_setnetgrent_reuse (const char *group, struct __netgrent *datap,
|
||
int *errnop)
|
||
{
|
||
enum nss_status (*fct) (const char *, struct __netgrent *);
|
||
enum nss_status status = NSS_STATUS_UNAVAIL;
|
||
struct name_list *new_elem;
|
||
int no_more;
|
||
|
||
/* Cycle through all the services and run their setnetgrent functions. */
|
||
no_more = setup ((void **) &fct, "setnetgrent", 1);
|
||
while (! no_more)
|
||
{
|
||
/* Ignore status, we force check in `__nss_next'. */
|
||
status = (*fct) (group, datap);
|
||
|
||
no_more = __nss_next (&nip, "setnetgrent", (void **) &fct, status, 0);
|
||
}
|
||
|
||
/* Add the current group to the list of known groups. */
|
||
new_elem = (struct name_list *) malloc (sizeof (struct name_list));
|
||
if (new_elem == NULL || (new_elem->name = __strdup (group)) == NULL)
|
||
{
|
||
if (new_elem != NULL)
|
||
free (new_elem);
|
||
*errnop = errno;
|
||
status = NSS_STATUS_TRYAGAIN;
|
||
}
|
||
else
|
||
{
|
||
new_elem->next = datap->known_groups;
|
||
datap->known_groups = new_elem;
|
||
}
|
||
|
||
return status == NSS_STATUS_SUCCESS;
|
||
}
|
||
|
||
int
|
||
__internal_setnetgrent (const char *group, struct __netgrent *datap)
|
||
{
|
||
/* Free list of all netgroup names from last run. */
|
||
free_memory (datap);
|
||
|
||
return __internal_setnetgrent_reuse (group, datap, __errno_location ());
|
||
}
|
||
|
||
int
|
||
setnetgrent (const char *group)
|
||
{
|
||
int result;
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
result = __internal_setnetgrent (group, &dataset);
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return result;
|
||
}
|
||
|
||
|
||
void
|
||
__internal_endnetgrent (struct __netgrent *datap)
|
||
{
|
||
service_user *old_nip;
|
||
enum nss_status (*fct) (struct __netgrent *);
|
||
int no_more;
|
||
|
||
/* Remember which was the last used service. */
|
||
old_nip = nip;
|
||
|
||
/* Cycle through all the services and run their endnetgrent functions. */
|
||
no_more = setup ((void **) &fct, "endnetgrent", 1);
|
||
while (! no_more)
|
||
{
|
||
/* Ignore status, we force check in `__nss_next'. */
|
||
(void) (*fct) (datap);
|
||
|
||
no_more = (nip == old_nip
|
||
|| __nss_next (&nip, "endnetgrent", (void **) &fct, 0, 1));
|
||
}
|
||
|
||
/* Now free list of all netgroup names from last run. */
|
||
free_memory (datap);
|
||
}
|
||
|
||
|
||
void
|
||
endnetgrent (void)
|
||
{
|
||
__libc_lock_lock (lock);
|
||
|
||
__internal_endnetgrent (&dataset);
|
||
|
||
__libc_lock_unlock (lock);
|
||
}
|
||
|
||
|
||
int
|
||
__internal_getnetgrent_r (char **hostp, char **userp, char **domainp,
|
||
struct __netgrent *datap,
|
||
char *buffer, size_t buflen, int *errnop)
|
||
{
|
||
enum nss_status (*fct) (struct __netgrent *, char *, size_t);
|
||
int no_more;
|
||
|
||
/* Initialize status to return if no more functions are found. */
|
||
enum nss_status status = NSS_STATUS_NOTFOUND;
|
||
|
||
/* Run through available functions, starting with the same function last
|
||
run. We will repeat each function as long as it succeeds, and then go
|
||
on to the next service action. */
|
||
no_more = setup ((void **) &fct, "getnetgrent_r", 0);
|
||
while (! no_more)
|
||
{
|
||
status = (*fct) (datap, buffer, buflen);
|
||
|
||
if (status == NSS_STATUS_RETURN)
|
||
{
|
||
/* This was the last one for this group. Look at next group
|
||
if available. */
|
||
int found = 0;
|
||
while (datap->needed_groups != NULL && ! found)
|
||
{
|
||
struct name_list *tmp = datap->needed_groups;
|
||
datap->needed_groups = datap->needed_groups->next;
|
||
tmp->next = datap->known_groups;
|
||
datap->known_groups = tmp;
|
||
|
||
found = __internal_setnetgrent_reuse (datap->known_groups->name,
|
||
datap, errnop);
|
||
}
|
||
|
||
if (found)
|
||
continue;
|
||
}
|
||
else if (status == NSS_STATUS_SUCCESS && datap->type == group_val)
|
||
{
|
||
/* The last entry was a name of another netgroup. */
|
||
struct name_list *namep;
|
||
|
||
/* Ignore if we've seen the name before. */
|
||
for (namep = datap->known_groups; namep != NULL;
|
||
namep = namep->next)
|
||
if (strcmp (datap->val.group, namep->name) == 0)
|
||
break;
|
||
if (namep != NULL)
|
||
/* Really ignore. */
|
||
continue;
|
||
|
||
namep = (struct name_list *) malloc (sizeof (struct name_list));
|
||
if (namep == NULL
|
||
|| (namep->name = __strdup (datap->val.group)) == NULL)
|
||
{
|
||
/* We are out of memory. */
|
||
if (namep != NULL)
|
||
free (namep);
|
||
status = NSS_STATUS_RETURN;
|
||
}
|
||
else
|
||
{
|
||
namep->next = datap->needed_groups;
|
||
datap->needed_groups = namep;
|
||
/* And get the next entry. */
|
||
continue;
|
||
}
|
||
}
|
||
|
||
no_more = __nss_next (&nip, "getnetgrent_r", (void **) &fct, status, 0);
|
||
}
|
||
|
||
if (status == NSS_STATUS_SUCCESS)
|
||
{
|
||
*hostp = (char *) datap->val.triple.host;
|
||
*userp = (char *) datap->val.triple.user;
|
||
*domainp = (char *) datap->val.triple.domain;
|
||
}
|
||
|
||
return status == NSS_STATUS_SUCCESS ? 1 : 0;
|
||
}
|
||
|
||
/* The real entry point. */
|
||
int
|
||
__getnetgrent_r (char **hostp, char **userp, char **domainp,
|
||
char *buffer, size_t buflen)
|
||
{
|
||
enum nss_status status;
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
status = __internal_getnetgrent_r (hostp, userp, domainp, &dataset,
|
||
buffer, buflen, __errno_location ());
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|
||
weak_alias (__getnetgrent_r, getnetgrent_r)
|
||
|
||
/* Test whether given (host,user,domain) triple is in NETGROUP. */
|
||
int
|
||
innetgr (const char *netgroup, const char *host, const char *user,
|
||
const char *domain)
|
||
{
|
||
int (*setfct) (const char *, struct __netgrent *);
|
||
void (*endfct) (struct __netgrent *);
|
||
int (*getfct) (struct __netgrent *, char *, size_t);
|
||
struct name_list *known = NULL;
|
||
struct name_list *needed = NULL;
|
||
int result = 0;
|
||
int no_more;
|
||
const char *current_group = netgroup;
|
||
int real_entry = 0;
|
||
|
||
/* Walk through the services until we found an answer or we shall
|
||
not work further. We can do some optimization here. Since all
|
||
services must provide the `setnetgrent' function we can do all
|
||
the work during one walk through the service list. */
|
||
while (1)
|
||
{
|
||
no_more = setup ((void **) &setfct, "setnetgrent", 1);
|
||
while (! no_more)
|
||
{
|
||
enum nss_status status;
|
||
struct __netgrent entry;
|
||
|
||
/* Clear the space for the netgroup data. */
|
||
bzero (&entry, sizeof (entry));
|
||
|
||
/* Open netgroup. */
|
||
status = (*setfct) (current_group, &entry);
|
||
if (status == NSS_STATUS_SUCCESS
|
||
&& __nss_lookup (&nip, "getnetgrent_r", (void **) &getfct) == 0)
|
||
{
|
||
char buffer[1024];
|
||
|
||
while ((*getfct) (&entry, buffer, sizeof buffer)
|
||
== NSS_STATUS_SUCCESS)
|
||
{
|
||
if (entry.type == group_val)
|
||
{
|
||
/* Make sure we haven't seen the name before. */
|
||
struct name_list *namep;
|
||
|
||
for (namep = known; namep != NULL; namep = namep->next)
|
||
if (strcmp (entry.val.group, namep->name) == 0)
|
||
break;
|
||
if (namep == NULL
|
||
&& strcmp (netgroup, entry.val.group) != 0)
|
||
{
|
||
namep =
|
||
(struct name_list *) malloc (sizeof (*namep));
|
||
if (namep == NULL
|
||
|| ((namep->name = __strdup (entry.val.group))
|
||
== NULL))
|
||
{
|
||
/* Out of memory, simply return. */
|
||
if (namep != NULL)
|
||
free (namep);
|
||
result = -1;
|
||
break;
|
||
}
|
||
|
||
namep->next = needed;
|
||
needed = namep;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
real_entry = 1;
|
||
|
||
if ((entry.val.triple.host == NULL || host == NULL
|
||
|| strcmp (entry.val.triple.host, host) == 0)
|
||
&& (entry.val.triple.user == NULL || user == NULL
|
||
|| strcmp (entry.val.triple.user, user) == 0)
|
||
&& (entry.val.triple.domain == NULL || domain == NULL
|
||
|| strcmp (entry.val.triple.domain, domain) == 0))
|
||
{
|
||
result = 1;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (result != 0)
|
||
break;
|
||
|
||
/* If we found one service which does know the given
|
||
netgroup we don't try further. */
|
||
status = NSS_STATUS_RETURN;
|
||
}
|
||
|
||
/* Free all resources of the service. */
|
||
if (__nss_lookup (&nip, "endnetgrent", (void **) &endfct) == 0)
|
||
(*endfct) (&entry);
|
||
|
||
/* Look for the next service. */
|
||
no_more = __nss_next (&nip, "setnetgrent",
|
||
(void **) &setfct, status, 0);
|
||
}
|
||
|
||
if (result == 0 && needed != NULL)
|
||
{
|
||
struct name_list *tmp = needed;
|
||
needed = tmp->next;
|
||
tmp->next = known;
|
||
known = tmp;
|
||
current_group = known->name;
|
||
continue;
|
||
}
|
||
|
||
/* No way out. */
|
||
break;
|
||
}
|
||
|
||
/* Free the memory. */
|
||
while (known != NULL)
|
||
{
|
||
struct name_list *tmp = known;
|
||
known = known->next;
|
||
free ((void *) tmp->name);
|
||
free (tmp);
|
||
}
|
||
while (needed != NULL)
|
||
{
|
||
struct name_list *tmp = needed;
|
||
needed = needed->next;
|
||
free ((void *) tmp->name);
|
||
free (tmp);
|
||
}
|
||
|
||
return result == 1;
|
||
}
|