mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
14ea22e96c
1998-02-15 Ulrich Drepper <drepper@cygnus.com> * nss/nsswitch.c (__nss_lookup): Return 1 if this was the last module. * nss/getXXent_r.c: If no more module is found don't try to call setXXent functions but leave unsuccessfully. * malloc/obstack.h: Cleanups. * sysdeps/wordsize-32/stdint.h: New file. * sysdeps/wordsize-64/stdint.h: New file. * sysdeps/generic/stdint.h: New file. * sysdeps/wordsize-32/inttypes.h: Adopt to use stdint.h. * sysdeps/wordsize-64/inttypes.h: Likewise. * stdlib/Makefile (headers): Add stdint.h. 1998-02-03 Paul Eggert <eggert@twinsun.com> * malloc/obstack.h (PTR_INT_TYPE): Use __PTRDIFF_TYPE__ if available. 1998-02-13 17:59 Zack Weinberg <zack@rabi.phys.columbia.edu> * timezone: New directory. * time/README, time/africa, time/antarctica, time/asia, time/australasia, time/backward, time/checktab.awk, time/etcetera, time/europe, time/factory, time/ialloc.c, time/iso3166.tab, time/leapseconds, time/northamerica, time/pacificnew, time/private.h, time/scheck.c, time/solar87, time/solar88, time/solar89, time/southamerica, time/systemv, time/test-tz.c, time/tzfile.h, time/tzselect.ksh, time/yearistype, time/zdump.c, time/zic.c, time/zone.tab: Moved to timezone. * time/tzfile.c: Include tzfile.h from timezone subdir. * time/tzset.c: Likewise. * time/Makefile: Cut out all code relating to timezones... * timezone/Makefile: ...and paste it in here. * Makefile (subdirs): Add timezone. 1998-02-13 18:45 H.J. Lu <hjl@gnu.org> * libc.map (_sys_nerr): Added. * sysdeps/unix/sysv/linux/errlist.c (_sys_nerr): Make it versioned symbol. 1998-02-15 17:16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/bits/socket.h: Define PF_KEY and pseudo_AF_KEY instead of pseudo_PF_KEY and AF_KEY. Reported by Craig Metz <cmetz@inner.net>. 1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): Use __strcasecmp instead of strcasecmp. * nss/nss_files/files-alias.c (get_next_alias): Likewise. * wctype/wctype.h (_ISwbit): Avoid warning with gcc before 2.8. 1998-02-15 16:55 Ulrich Drepper <drepper@cygnus.com> * socket/sys/socket.h (setsockopt): Make OPTVAL parameter const. Patch by Dean Gaudet <dgaudet@arctic.org>. 1998-02-15 16:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/Dist: Add getresgid.c and getresuid.c. 1998-02-15 10:49 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/unix/sysv/linux/poll.c: If compiled against a kernel with no poll syscall, just include the BSD version. * sysdeps/unix/sysv/linux/getresuid.c: If compiled against a kernel without the syscall, include the stub version. * sysdeps/unix/sysv/linux/getresgid.c: Likewise. * sysdeps/generic/getresuid.c: New file. * sysdeps/generic/getresgid.c: New file. 1998-02-15 Ulrich Drepper <drepper@cygnus.com> * stdio-common/vfscanf.c: Correct last change a bit.
299 lines
8.7 KiB
C
299 lines
8.7 KiB
C
/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 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 <errno.h>
|
||
#include <bits/libc-lock.h>
|
||
|
||
#include "nsswitch.h"
|
||
|
||
/*******************************************************************\
|
||
|* Here we assume several symbols to be defined: *|
|
||
|* *|
|
||
|* LOOKUP_TYPE - the return type of the function *|
|
||
|* *|
|
||
|* SETFUNC_NAME - name of the non-reentrant setXXXent function *|
|
||
|* *|
|
||
|* GETFUNC_NAME - name of the non-reentrant getXXXent function *|
|
||
|* *|
|
||
|* ENDFUNC_NAME - name of the non-reentrant endXXXent function *|
|
||
|* *|
|
||
|* DATABASE_NAME - name of the database the function accesses *|
|
||
|* (e.g., host, services, ...) *|
|
||
|* *|
|
||
|* Optionally the following vars can be defined: *|
|
||
|* *|
|
||
|* STAYOPEN - variable declaration for setXXXent function *|
|
||
|* *|
|
||
|* STAYOPEN_VAR - variable name for setXXXent function *|
|
||
|* *|
|
||
|* NEED_H_ERRNO - an extra parameter will be passed to point to *|
|
||
|* the global `h_errno' variable. *|
|
||
|* *|
|
||
\*******************************************************************/
|
||
|
||
/* To make the real sources a bit prettier. */
|
||
#define REENTRANT_GETNAME APPEND_R (GETFUNC_NAME)
|
||
#define APPEND_R(Name) CONCAT2_2 (Name, _r)
|
||
#define INTERNAL(Name) CONCAT2_2 (__, Name)
|
||
#define CONCAT2_1(Pre, Post) CONCAT2_2 (Pre, Post)
|
||
#define CONCAT2_2(Pre, Post) Pre##Post
|
||
|
||
#define SETFUNC_NAME_STRING STRINGIZE (SETFUNC_NAME)
|
||
#define GETFUNC_NAME_STRING STRINGIZE (REENTRANT_GETNAME)
|
||
#define ENDFUNC_NAME_STRING STRINGIZE (ENDFUNC_NAME)
|
||
#define DATABASE_NAME_STRING STRINGIZE (DATABASE_NAME)
|
||
#define STRINGIZE(Name) STRINGIZE1 (Name)
|
||
#define STRINGIZE1(Name) #Name
|
||
|
||
#define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
|
||
#define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
|
||
#define CONCAT3_2(Pre, Name, Post) Pre##Name##Post
|
||
|
||
/* Sometimes we need to store error codes in the `h_errno' variable. */
|
||
#ifdef NEED_H_ERRNO
|
||
# define H_ERRNO_PARM , int *h_errnop
|
||
# define H_ERRNO_VAR , &h_errno
|
||
#else
|
||
# define H_ERRNO_PARM
|
||
# define H_ERRNO_VAR
|
||
#endif
|
||
|
||
/* Some databases take the `stayopen' flag. */
|
||
#ifdef STAYOPEN
|
||
# define STAYOPEN_TMP CONCAT2_1 (STAYOPEN, _tmp)
|
||
# define STAYOPEN_TMPVAR CONCAT2_1 (STAYOPEN_VAR, _tmp)
|
||
#else
|
||
# define STAYOPEN void
|
||
# define STAYOPEN_VAR
|
||
# define STAYOPEN_TMPVAR
|
||
#endif
|
||
|
||
/* Prototype for the setXXXent functions we use here. */
|
||
typedef int (*set_function) (STAYOPEN);
|
||
|
||
/* Prototype for the endXXXent functions we use here. */
|
||
typedef int (*end_function) (void);
|
||
|
||
/* Prototype for the setXXXent functions we use here. */
|
||
typedef int (*get_function) (LOOKUP_TYPE *, char *, size_t, int *
|
||
H_ERRNO_PARM);
|
||
|
||
|
||
/* This handle for the NSS data base is shared between all
|
||
set/get/endXXXent functions. */
|
||
static service_user *nip;
|
||
/* Remember the last service used since the last call to `endXXent'. */
|
||
static service_user *last_nip;
|
||
/* Remember the first service_entry, it's always the same. */
|
||
static service_user *startp;
|
||
|
||
#ifdef STAYOPEN_TMP
|
||
/* We need to remember the last `stayopen' flag given by the user
|
||
since the `setent' function is only called for the first available
|
||
service. */
|
||
static STAYOPEN_TMP;
|
||
#endif
|
||
|
||
/* Protect above variable against multiple uses at the same time. */
|
||
__libc_lock_define_initialized (static, lock)
|
||
|
||
/* The lookup function for the first entry of this service. */
|
||
extern int DB_LOOKUP_FCT (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)
|
||
{
|
||
int no_more;
|
||
if (startp == NULL)
|
||
{
|
||
no_more = DB_LOOKUP_FCT (&nip, func_name, fctp);
|
||
startp = no_more ? (service_user *) -1l : nip;
|
||
}
|
||
else if (startp == (service_user *) -1l)
|
||
/* 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;
|
||
}
|
||
|
||
void
|
||
SETFUNC_NAME (STAYOPEN)
|
||
{
|
||
set_function fct;
|
||
int no_more;
|
||
|
||
#ifdef NEED__RES
|
||
if ((_res.options & RES_INIT) == 0 && res_init () == -1)
|
||
{
|
||
__set_h_errno (NETDB_INTERNAL);
|
||
return;
|
||
}
|
||
#endif /* need _res */
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
/* Cycle through the services and run their `setXXent' functions until
|
||
we find an available service. */
|
||
no_more = setup ((void **) &fct, SETFUNC_NAME_STRING, 1);
|
||
while (! no_more)
|
||
{
|
||
int is_last_nip = nip == last_nip;
|
||
enum nss_status status = (*fct) (STAYOPEN_VAR);
|
||
|
||
no_more = __nss_next (&nip, SETFUNC_NAME_STRING, (void **) &fct,
|
||
status, 0);
|
||
if (is_last_nip)
|
||
last_nip = nip;
|
||
}
|
||
|
||
#ifdef STAYOPEN_TMP
|
||
STAYOPEN_TMPVAR = STAYOPEN_VAR;
|
||
#endif
|
||
|
||
__libc_lock_unlock (lock);
|
||
}
|
||
|
||
|
||
void
|
||
ENDFUNC_NAME (void)
|
||
{
|
||
end_function fct;
|
||
int no_more;
|
||
|
||
#ifdef NEED__RES
|
||
if ((_res.options & RES_INIT) == 0 && res_init () == -1)
|
||
{
|
||
__set_h_errno (NETDB_INTERNAL);
|
||
return;
|
||
}
|
||
#endif /* need _res */
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
/* Cycle through all the services and run their endXXent functions. */
|
||
no_more = setup ((void **) &fct, ENDFUNC_NAME_STRING, 1);
|
||
while (! no_more)
|
||
{
|
||
/* Ignore status, we force check in __NSS_NEXT. */
|
||
(void) (*fct) ();
|
||
|
||
if (nip == last_nip)
|
||
/* We have processed all services which were used. */
|
||
break;
|
||
|
||
no_more = __nss_next (&nip, ENDFUNC_NAME_STRING, (void **) &fct, 0, 1);
|
||
}
|
||
last_nip = nip = NULL;
|
||
|
||
__libc_lock_unlock (lock);
|
||
}
|
||
|
||
|
||
int
|
||
INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen,
|
||
LOOKUP_TYPE **result H_ERRNO_PARM)
|
||
{
|
||
get_function fct;
|
||
int no_more;
|
||
enum nss_status status;
|
||
|
||
#ifdef NEED__RES
|
||
if ((_res.options & RES_INIT) == 0 && res_init () == -1)
|
||
{
|
||
__set_h_errno (NETDB_INTERNAL);
|
||
*result = NULL;
|
||
return -1;
|
||
}
|
||
#endif /* need _res */
|
||
|
||
/* Initialize status to return if no more functions are found. */
|
||
status = NSS_STATUS_NOTFOUND;
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
/* 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, GETFUNC_NAME_STRING, 0);
|
||
while (! no_more)
|
||
{
|
||
int is_last_nip = nip == last_nip;
|
||
service_user *current_nip = nip;
|
||
|
||
status = (*fct) (resbuf, buffer, buflen, __errno_location ()
|
||
H_ERRNO_VAR);
|
||
|
||
/* The the status is NSS_STATUS_TRYAGAIN and errno is ERANGE the
|
||
provided buffer is too small. In this case we should give
|
||
the user the possibility to enlarge the buffer and we should
|
||
not simply go on with the next service (even if the TRYAGAIN
|
||
action tells us so). */
|
||
if (status == NSS_STATUS_TRYAGAIN
|
||
#ifdef NEED_H_ERRNO
|
||
&& *h_errnop == NETDB_INTERNAL
|
||
#endif
|
||
&& errno == ERANGE)
|
||
break;
|
||
|
||
no_more = __nss_next (&nip, GETFUNC_NAME_STRING, (void **) &fct,
|
||
status, 0);
|
||
|
||
if (is_last_nip)
|
||
last_nip = nip;
|
||
|
||
if (! no_more && current_nip != nip)
|
||
/* Call the `setXXent' function. This wasn't done before. */
|
||
do
|
||
{
|
||
set_function sfct;
|
||
|
||
no_more = __nss_lookup (&nip, SETFUNC_NAME_STRING,
|
||
(void **) &sfct);
|
||
|
||
if (! no_more)
|
||
status = (*sfct) (STAYOPEN_TMPVAR);
|
||
else
|
||
{
|
||
status = NSS_STATUS_NOTFOUND;
|
||
if (no_more == 1)
|
||
/* There is no more module to search. */
|
||
break;
|
||
}
|
||
}
|
||
while (! no_more && status != NSS_STATUS_SUCCESS);
|
||
}
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
*result = status == NSS_STATUS_SUCCESS ? resbuf : NULL;
|
||
return status == NSS_STATUS_SUCCESS ? 0 : -1;
|
||
}
|
||
#define do_weak_alias(n1, n2) weak_alias (n1, n2)
|
||
do_weak_alias (INTERNAL (REENTRANT_GETNAME), REENTRANT_GETNAME)
|