mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-18 06:30:05 +00:00
d71b808a96
1997-12-08 03:24 Ulrich Drepper <drepper@cygnus.com> * Makeconfig: Define $(rt) to rt if linuxthreads is available. * Makefile (subdirs): Replace rt by $(rt). * shlib-versions: Use version .2 for NSS modules. * grp/fgetgrent_r.c (LINE_PARSER): Call parse_line with extra argument. * pwd/fgetpwent_r.c: Likewise. * spwd/fgetspent_r.c: Likewise. * spwd/sgetspent_r.c: Likewise. * hesiod/nss_hesiod/hesiod-grp.c (lookup): Add new argument. Store error number in *ERRNOP. Little optimization. * hesiod/nss_hesiod/hesiod-pwd.c: Likewise. * hesiod/nss_hesiod/hesiod-service.c: Likewise. * inet/getnetgrent_r.c (__internal_setnetgrent_reuse): Likewise. (__internal_getnetgrent_r): New argument. Call __internal_setnetgrent_reuse with new argument. (__getnetgrent_r): Call __internal_getnetgrent_r with new argument. * inet/netgroup.h: Add argument to prototypes. * nis/nisplus-parser.h: Likewise. * nis/nss_compat/compat-grp.c: Change everything to store error code through provided pointer and not use errno. * nis/nss_compat/compat-pwd.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-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-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-parser.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. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-alias.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_files/files-XXX.c: Likewise * nss/nss_files/files-alias.c: Likewise * nss/nss_files/files-netgrp.c: Likewise * nss/nss_files/files-parse.c: Likewise * nss/getXXbyYY_r.c: Call with __errno_location() as value for new parameter of get functions. * nss/getXXent_r.c: Likewise. * localedata/tst-fmon.c: Print debug info if test fails. * rt/Makefile (routines): Add aio_notify. * rt/aio.h: Remove non-public definitions. Add aioinit stuff. * rt/aio_cancel.c: Rewrite to support lio_listio and aio_suspend. * rt/aio_fsync.c: Likewise. * rt/aio_misc.c: Likewise. * rt/aio_misc.h: Likewise. * rt/aio_read.c: Likewise. * rt/aio_read64.c: Likewise. * rt/aio_suspend.c: Likewise. * rt/aio_write.c: Likewise. * rt/aio_write64.c: Likewise. * rt/lio_listio.c: Likewise. * rt/lio_listio64.c: Likewise. * rt/aio_notify.c: New file. * sysdeps/generic/bits/sigset.h: Pretty print. * sysdeps/posix/pwrite.c: Define weak alias only if function is really defined as __pwrite. * sysdeps/unix/sysv/linux/pread.c: Rewrite to use syscall directly instead of pread64. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=signal] (sysdep_routines): Add rt_sigpending and rt_sigreturn. * sysdeps/unix/sysv/linux/sigaction.c: Use correct value for sigset_t size in syscall. * sysdeps/unix/sysv/linux/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigreturn.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. Take care for ACT being NULL. * sysdeps/unix/sysv/linux/syscalls.list: Don't mention user for RT signals. * sysdeps/unix/sysv/linux/i386/s_pread64.s: Return ENOSYS if __NR_pread is not defined. * sysdeps/unix/sysv/linux/i386/s_pwrite64.s: Return ENOSYS if __NR_pwrite is not defined. 1997-12-07 11:15 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: If buffer is to small, set the file handle for /etc/group back in some more cases. * nis/nss_compat/compat-pwd.c: If buffer is to small, set the file handle for /etc/passwd back in some more cases. * nis/nss_compat/compat-spwd.c: If buffer is to small, set the file handle for /etc/shadow back in some more cases. 1997-12-06 17:00 H.J. Lu <hjl@gnu.org> * sysdeps/posix/sigblock.c (__sigblock): Don't check int mask beyound its size. * sysdeps/posix/sigsetmask.c (__sigsetmask): Ditto. * sysdeps/posix/sigvec.c (convert_mask, __sigvec): Ditto. 1997-12-06 04:38 Ulrich Drepper <drepper@cygnus.com> * sysdeps/wordsize-32/inttypes.h: Rewrite {str,wcs}to{i,u}max handling. Don't use macros, we need functions. Use inline functions for optimization. * sysdeps/wordsize-64/inttypes.h: Likewise. * sysdeps/wordsize-32/Makefile: Add strtoimax, stroumax, wcstoimax, and wcstoumax. * sysdeps/wordsize-64/Makefile: Likewise. * sysdeps/wordsize-32/Dist: Likewise. * sysdeps/wordsize-64/Dist: Likewise. * sysdeps/wordsize-32/strtoimax.c: New file. * sysdeps/wordsize-32/strtoumax.c: New file. * sysdeps/wordsize-32/wcstoimax.c: New file. * sysdeps/wordsize-32/wcstoumax.c: New file. * sysdeps/wordsize-64/strtoimax.c: New file. * sysdeps/wordsize-64/strtoumax.c: New file. * sysdeps/wordsize-64/wcstoimax.c: New file. * sysdeps/wordsize-64/wcstoumax.c: New file. 1997-12-04 10:40 Philip Blundell <pb@nexus.co.uk> * sysdeps/generic/wait3.c (__wait3): Use ANSI-style definition so that transparent union works. * sysdeps/generic/wait4.c (__wait4): Likewise. * sysdeps/generic/wait.c (__wait): Likewise. * sysdeps/generic/getpeername.c (getpeername): Use socklen_t not size_t. * sysdeps/generic/syscall.c (syscall): Return value and arg are long, to match prototype. * malloc/malloc.c (HAVE_MREMAP): Set to 0 for ARM, as we don't have mremap() yet. * sysdeps/generic/usleep.c (usleep): Returns void, to match prototype. * sysdeps/unix/sysv/linux/arm/syscalls.list: New file. * sysdeps/generic/bits/time.h: Use __time_t not time_t. * sysdeps/generic/bits/resource.h: Include <bits/types.h> for __rlim_t. * sysdeps/standalone/arm/bits/errno.h (ENOTTY): Added. * sysdeps/generic/bits/dirent.h (struct dirent64): Added. * io/sys/stat.h (S_ISLNK): Always false if we don't have __S_IFLNK. * sysdeps/standalone/close.c (_STDIO_H): Define before including <bits/stdio_lim.h>. * sysdeps/standalone/filedesc.h (_STDIO_H): Likewise. 1997-12-06 01:09 Ulrich Drepper <drepper@cygnus.com> * posix/sys/wait.h: Don't use transparent unions in C++. 1997-12-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * time/time.h: Add strfxtime. * libc.map: Add tcgetsid, strcasestr, wmemrtombs, wmemrtowcs, sysv_signal, strfxtime, pread64, pwrite64. 1997-11-30 21:57 Richard Henderson <rth@cygnus.com> Alpha changes for EGCS: * config.h.in (ASM_ALPHA_NG_SYMBOL_PREFIX): New entry. * configure.in (libc_cv_gcc_alpha_ng_prefix): New check. * sysdeps/alpha/dl-machine.h (_dl_runtime_resolve): Care for prefix. (_start): Likewise. * sysdeps/unix/sysv/linux/alpha/init-first.h: Likewise.
427 lines
11 KiB
C
427 lines
11 KiB
C
/* Copyright (C) 1996, 1997 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 <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;
|
||
}
|