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.
230 lines
5.9 KiB
C
230 lines
5.9 KiB
C
/* Common code for DB-based databases in nss_db module.
|
||
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 <db_185.h>
|
||
#include <fcntl.h>
|
||
#include <bits/libc-lock.h>
|
||
#include "nsswitch.h"
|
||
|
||
/* These symbols are defined by the including source file:
|
||
|
||
ENTNAME -- database name of the structure and functions (hostent, pwent).
|
||
STRUCTURE -- struct name, define only if not ENTNAME (passwd, group).
|
||
DATABASE -- database file name, ("hosts", "passwd")
|
||
|
||
NEED_H_ERRNO - defined iff an arg `int *herrnop' is used.
|
||
*/
|
||
|
||
#define ENTNAME_r CONCAT(ENTNAME,_r)
|
||
|
||
#include <paths.h>
|
||
#define DBFILE _PATH_VARDB DATABASE ".db"
|
||
|
||
#ifdef NEED_H_ERRNO
|
||
#define H_ERRNO_PROTO , int *herrnop
|
||
#define H_ERRNO_ARG , herrnop
|
||
#define H_ERRNO_SET(val) (*herrnop = (val))
|
||
#else
|
||
#define H_ERRNO_PROTO
|
||
#define H_ERRNO_ARG
|
||
#define H_ERRNO_SET(val) ((void) 0)
|
||
#endif
|
||
|
||
/* Locks the static variables in this file. */
|
||
__libc_lock_define_initialized (static, lock)
|
||
|
||
/* Maintenance of the shared handle open on the database. */
|
||
|
||
static DB *db;
|
||
static int keep_db;
|
||
static unsigned int entidx; /* Index for `getENTNAME'. */
|
||
|
||
/* Open database file if not already opened. */
|
||
static enum nss_status
|
||
internal_setent (int stayopen)
|
||
{
|
||
enum nss_status status = NSS_STATUS_SUCCESS;
|
||
|
||
if (db == NULL)
|
||
{
|
||
db = __dbopen (DBFILE, O_RDONLY, 0, DB_BTREE, NULL);
|
||
|
||
if (db == NULL)
|
||
status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
|
||
else
|
||
{
|
||
/* We have to make sure the file is `closed on exec'. */
|
||
int result, flags;
|
||
|
||
result = flags = fcntl ((*db->fd) (db), F_GETFD, 0);
|
||
if (result >= 0)
|
||
{
|
||
flags |= FD_CLOEXEC;
|
||
result = fcntl ((*db->fd) (db), F_SETFD, flags);
|
||
}
|
||
if (result < 0)
|
||
{
|
||
/* Something went wrong. Close the stream and return a
|
||
failure. */
|
||
(*db->close) (db);
|
||
db = NULL;
|
||
status = NSS_STATUS_UNAVAIL;
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Remember STAYOPEN flag. */
|
||
if (db != NULL)
|
||
keep_db |= stayopen;
|
||
|
||
return status;
|
||
}
|
||
|
||
|
||
/* Thread-safe, exported version of that. */
|
||
enum nss_status
|
||
CONCAT(_nss_db_set,ENTNAME) (int stayopen)
|
||
{
|
||
enum nss_status status;
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
status = internal_setent (stayopen);
|
||
|
||
/* Reset the sequential index. */
|
||
entidx = 0;
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|
||
|
||
|
||
/* Close the database file. */
|
||
static void
|
||
internal_endent (void)
|
||
{
|
||
if (db != NULL)
|
||
{
|
||
(*db->close) (db);
|
||
db = NULL;
|
||
}
|
||
}
|
||
|
||
|
||
/* Thread-safe, exported version of that. */
|
||
enum nss_status
|
||
CONCAT(_nss_db_end,ENTNAME) (void)
|
||
{
|
||
__libc_lock_lock (lock);
|
||
|
||
internal_endent ();
|
||
|
||
/* Reset STAYOPEN flag. */
|
||
keep_db = 0;
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return NSS_STATUS_SUCCESS;
|
||
}
|
||
|
||
/* Do a database lookup for KEY. */
|
||
static enum nss_status
|
||
lookup (const DBT *key, struct STRUCTURE *result,
|
||
void *buffer, size_t buflen, int *errnop H_ERRNO_PROTO)
|
||
{
|
||
enum nss_status status;
|
||
int err;
|
||
DBT value;
|
||
|
||
/* Open the database. */
|
||
status = internal_setent (keep_db);
|
||
if (status != NSS_STATUS_SUCCESS)
|
||
return status;
|
||
|
||
/* Succeed iff it matches a value that parses correctly. */
|
||
err = ((*db->get) (db, key, &value, 0) == 0 &&
|
||
parse_line (value.data, result, buffer, buflen, errnop));
|
||
if (err == 0)
|
||
status = NSS_STATUS_SUCCESS;
|
||
else
|
||
status = err < 0 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
|
||
|
||
if (! keep_db)
|
||
internal_endent ();
|
||
|
||
return status;
|
||
}
|
||
|
||
|
||
/* Macro for defining lookup functions for this DB-based database.
|
||
|
||
NAME is the name of the lookup; e.g. `pwnam'.
|
||
|
||
KEYPATTERN gives `printf' args to construct a key string;
|
||
e.g. `(".%s", name)'.
|
||
|
||
KEYSIZE gives the allocation size of a buffer to construct it in;
|
||
e.g. `1 + strlen (name)'.
|
||
|
||
PROTO describes the arguments for the lookup key;
|
||
e.g. `const char *name'.
|
||
|
||
BREAK_IF_MATCH is ignored, but used by ../nss_files/files-XXX.c. */
|
||
|
||
#define DB_LOOKUP(name, keysize, keypattern, break_if_match, proto...) \
|
||
enum nss_status \
|
||
_nss_db_get##name##_r (proto, \
|
||
struct STRUCTURE *result, \
|
||
char *buffer, size_t buflen, int *errnop H_ERRNO_PROTO)\
|
||
{ \
|
||
DBT key; \
|
||
enum nss_status status; \
|
||
const size_t size = (keysize); \
|
||
key.data = __alloca (size); \
|
||
key.size = KEYPRINTF keypattern; \
|
||
__libc_lock_lock (lock); \
|
||
status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG); \
|
||
__libc_lock_unlock (lock); \
|
||
return status; \
|
||
}
|
||
|
||
#define KEYPRINTF(pattern, args...) snprintf (key.data, size, pattern ,##args)
|
||
|
||
|
||
|
||
|
||
/* Return the next entry from the database file, doing locking. */
|
||
enum nss_status
|
||
CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer,
|
||
size_t buflen, int *errnop H_ERRNO_PROTO)
|
||
{
|
||
/* Return next entry in host file. */
|
||
enum nss_status status;
|
||
char buf[20];
|
||
DBT key;
|
||
|
||
__libc_lock_lock (lock);
|
||
key.size = 1 + snprintf (key.data = buf, sizeof buf, "0%u", entidx++);
|
||
status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG);
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|