mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-17 22:20:11 +00:00
740152054e
1998-01-22 00:55 Ulrich Drepper <drepper@happy.cygnus.com> * libc.map: Add __libc_uid, __libc_pid, __syscall_rt_sigqueueinfo, __pread64, __pwrite64, and __getpid. * libc/rt/aio_misc.c: Use pread and pwrite instead of __ protected versions. 1998-01-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define the cancelable socket functions as __libc_xxx with __xxx as weak alias. * sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/m68k/socket.S: Allow __socket to be redefined. * sysdeps/unix/sysv/linux/i386/socket.S: Likewise. * sysdeps/unix/sysv/linux/arm/socket.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Likewise. * sysdeps/unix/sysv/linux/accept.S: Make __libc_xxx the main name and __xxx a weak alias. * sysdeps/unix/sysv/linux/connect.S: Likewise. * sysdeps/unix/sysv/linux/recv.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/recvmsg.S: Likewise. * sysdeps/unix/sysv/linux/send.S: Likewise. * sysdeps/unix/sysv/linux/sendmsg.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. 1998-01-21 Andreas Jaeger <aj@arthur.rhein-neckar.de> * locale/langinfo.h: Add defines. * dirent/dirent.h: Add defines for DT_*, check also for _DIRENT_HAVE_D_TYPE. Suggested by Roland McGrath. 1998-01-16 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/netinet/ip_fw.h: Update from Linux 2.1.73+79. * README.template: Update information about possible configurations. * manual/mbyte.texi (Wide String Conversion): Fix declaration of wcstombs. Pointed out by Jochen Voss <voss@mathematik.uni-kl.de>. [PR libc/417]. * manual/time.texi (Priority): Correct description of PRIO_MAX. Pointed out by Jochen Voss <voss@mathematik.uni-kl.de>. [PR libc/416]. 11998-01-21 21:34 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/fpu/bits/mathdef.h: Add definition of FP_ILOGB0 and FP_ILOGNAN. Patch by a sun <asun@zoology.washington.edu>. 1998-01-21 17:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/_strerror.c: Handle BUFLEN == 0. Reported by Andreas Jaeger. 1998-01-20 18:13 Ulrich Drepper <drepper@cygnus.com> * locale/programs/ld-collate.c: Little optimizations. * stdio-common/xbug.c: Unset LD_LIBRRARY_PATH variable. * string/Makefile (tests): Add tst-inlcall. * string/tst-inlcall.c: New file. * string/strsignal.c: Add support for real-time signals. * sysdeps/generic/_strerror.c: Fix Handling of unknown error in presense of small buffer. * sysdeps/i386/bits/string.h: Define _HAVE_STRING_ARCH_* macros. * sysdeps/i386/i486/bits/string.h: Correct strrchr implementation for i686. * sysdeps/unix/sysv/linux/siglist.c: Change length of arrays to _NSIG + 1. 1998-01-02 15:10 Matthias Urlichs <urlichs@noris.de> * Rules: Add explicit rule for dummy.o; at least one library needs it and it isn't autogenerated by the default rules. 1997-12-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/libm-test.c: Tweak epsilons. 1997-12-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/test-fenv.c (feenv_nomask_test): Avoid dumping core in the child. (feenv_mask_test): Likewise. 1998-01-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Don't export CPPFLAGS. 1998-01-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sunrpc/rpc_main.c (parseargs): Use perror to print error message. 1998-01-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/nss_db/db-alias.c (_nss_db_getaliasent_r): Don't include terminating null in key size. 1998-01-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/nss_files/files-service.c: Fix allocation size to include length of PROTO. * nss/nss_db/db-XXX.c (lookup): Always set errno and h_errno if applicable. Fix return value and error checking. (CONCAT(_nss_db_get,ENTNAME_r)): Loop around to skip over unparsable lines. (DB_LOOKUP): Allocate space for terminating null byte. * nss/db-Makefile ($(VAR_DB)/passwd.db): Don't handle duplicate uids specially. * db2/makedb.c (process_input): Continue processing if a duplicate key is encountered. 1998-01-19 15:20 Ulrich Drepper <drepper@cygnus.com> * time/tzfile.h: Updated from tzcode1998b. * time/zdump.c: Likewise. * time/zic.c: Likewise. * time/africa: Update from tzdata1998b. * time/antarctica: Likewise. * time/asia: Likewise. * time/australasia: Likewise. * time/etcetera: Likewise. * time/europe: Likewise. * time/leapseconds: Likewise. * time/northamerica: Likewise. * time/southamerica: Likewise. 1998-01-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nss_files/files-alias.c (get_next_alias): Do mail alias lookups ignoring case. * nss/nss_files/files-network.c: Do network lookups ignoring case. * nss/nss_files/files-hosts.c: Do hostname lookups ignoring case. * nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): New macro for case insensitive comparing. Patches by Cristian Gafton <gafton@redhat.com>. 1998-01-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/net/if.h: Add IFF_*defines. Suggested by Roland McGrath. [PR libc/395] 1998-01-08 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/arith.texi (Parsing of Integers): Correct description of strtoul. Pointed out by Scott Snyder <snyder@fnald0.fnal.gov>. [PR libc/396] 1997-12-30 14:14 Matthias Urlichs <urlichs@noris.de> * misc/lsearch.c (lsearch): Return a pointer to the new element if one was "allocated". 1997-12-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/strsignal.c: NSIG is not a valid index into _sys_siglist. Don't zap the last character of the "Unknown signal" message. 1998-01-19 15:08 Ulrich Drepper <drepper@cygnus.com> * locale/programs/charmap.c (parse_charmap): Correct parsing of ellipsis expressions. * locale/programs/charset.c (insert_char): Correctly insert value of eliipsis expression.
283 lines
6.9 KiB
C
283 lines
6.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)
|
||
{
|
||
char *p;
|
||
enum nss_status status;
|
||
int err;
|
||
DBT value;
|
||
|
||
/* Open the database. */
|
||
status = internal_setent (keep_db);
|
||
if (status != NSS_STATUS_SUCCESS)
|
||
{
|
||
*errnop = errno;
|
||
H_ERRNO_SET (NETDB_INTERNAL);
|
||
return status;
|
||
}
|
||
|
||
/* Succeed iff it matches a value that parses correctly. */
|
||
err = (*db->get) (db, key, &value, 0);
|
||
if (err < 0)
|
||
{
|
||
*errnop = errno;
|
||
H_ERRNO_SET (NETDB_INTERNAL);
|
||
status = NSS_STATUS_UNAVAIL;
|
||
}
|
||
else if (err != 0)
|
||
{
|
||
H_ERRNO_SET (HOST_NOT_FOUND);
|
||
status = NSS_STATUS_NOTFOUND;
|
||
}
|
||
else
|
||
{
|
||
/* Skip leading blanks. */
|
||
p = (char *) value.data;
|
||
while (isspace (*p))
|
||
++p;
|
||
|
||
err = parse_line (p, result, buffer, buflen, errnop);
|
||
|
||
if (err == 0)
|
||
{
|
||
/* If the key begins with '0' we are trying to get the next
|
||
entry. We want to ignore unparsable lines in this case. */
|
||
if (((char *) key->data)[0] == '0')
|
||
{
|
||
/* Super magical return value. We need to tell our caller
|
||
that it should continue looping. This value cannot
|
||
happen in other cases. */
|
||
status = NSS_STATUS_RETURN;
|
||
}
|
||
else
|
||
{
|
||
H_ERRNO_SET (HOST_NOT_FOUND);
|
||
status = NSS_STATUS_NOTFOUND;
|
||
}
|
||
}
|
||
else if (err < 0)
|
||
{
|
||
H_ERRNO_SET (NETDB_INTERNAL);
|
||
status = NSS_STATUS_TRYAGAIN;
|
||
}
|
||
else
|
||
status = NSS_STATUS_SUCCESS;
|
||
}
|
||
|
||
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) + 1; \
|
||
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);
|
||
|
||
/* Loop until we find a valid entry or hit EOF. See above for the
|
||
special meaning of the status value. */
|
||
do
|
||
{
|
||
key.size = snprintf (key.data = buf, sizeof buf, "0%u", entidx++);
|
||
status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG);
|
||
}
|
||
while (status == NSS_STATUS_RETURN);
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|