mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 19:51:11 +00:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * 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-network.c: Likewise. * nis/nss_nis/nis-proto.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-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.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. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
306 lines
8.7 KiB
C
306 lines
8.7 KiB
C
/* Common code for DB-based databases in nss_db module.
|
||
Copyright (C) 1996-2015 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 Lesser General Public
|
||
License as published by the Free Software Foundation; either
|
||
version 2.1 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
|
||
Lesser General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser General Public
|
||
License along with the GNU C Library; if not, see
|
||
<http://www.gnu.org/licenses/>. */
|
||
|
||
#include <dlfcn.h>
|
||
#include <fcntl.h>
|
||
#include <stdint.h>
|
||
#include <sys/mman.h>
|
||
#include <libc-lock.h>
|
||
#include "nsswitch.h"
|
||
#include "nss_db.h"
|
||
|
||
/* The hashing function we use. */
|
||
#include "../intl/hash-string.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
|
||
|
||
/* State for this database. */
|
||
static struct nss_db_map state;
|
||
/* Lock to protect the state and global variables. */
|
||
__libc_lock_define (static , lock);
|
||
|
||
/* Maintenance of the shared handle open on the database. */
|
||
static int keep_db;
|
||
static const char *entidx;
|
||
|
||
|
||
/* Open the database. */
|
||
enum nss_status
|
||
CONCAT(_nss_db_set,ENTNAME) (int stayopen)
|
||
{
|
||
enum nss_status status;
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
status = internal_setent (DBFILE, &state);
|
||
|
||
if (status == NSS_STATUS_SUCCESS)
|
||
{
|
||
/* Remember STAYOPEN flag. */
|
||
keep_db |= stayopen;
|
||
|
||
/* Reset the sequential index. */
|
||
entidx = (const char *) state.header + state.header->valstroffset;
|
||
}
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|
||
|
||
|
||
/* Close it again. */
|
||
enum nss_status
|
||
CONCAT(_nss_db_end,ENTNAME) (void)
|
||
{
|
||
__libc_lock_lock (lock);
|
||
|
||
internal_endent (&state);
|
||
|
||
/* Reset STAYOPEN flag. */
|
||
keep_db = 0;
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return NSS_STATUS_SUCCESS;
|
||
}
|
||
|
||
|
||
/* Macro for defining lookup functions for this DB-based database.
|
||
|
||
NAME is the name of the lookup; e.g. `pwnam'.
|
||
|
||
DB_CHAR is index indicator for the database.
|
||
|
||
KEYPATTERN gives `printf' args to construct a key string;
|
||
e.g. `("%d", id)'.
|
||
|
||
KEYSIZE gives the allocation size of a buffer to construct it in;
|
||
e.g. `1 + sizeof (id) * 4'.
|
||
|
||
PROTO is the potentially empty list of other parameters.
|
||
|
||
BREAK_IF_MATCH is a block of code which compares `struct STRUCTURE *result'
|
||
to the lookup key arguments and does `break;' if they match. */
|
||
|
||
#define DB_LOOKUP(name, db_char, 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)\
|
||
{ \
|
||
struct parser_data *data = (void *) buffer; \
|
||
\
|
||
if (buflen < sizeof *data) \
|
||
{ \
|
||
*errnop = ERANGE; \
|
||
H_ERRNO_SET (NETDB_INTERNAL); \
|
||
return NSS_STATUS_TRYAGAIN; \
|
||
} \
|
||
\
|
||
struct nss_db_map state = { NULL, 0 }; \
|
||
enum nss_status status = internal_setent (DBFILE, &state); \
|
||
if (status != NSS_STATUS_SUCCESS) \
|
||
{ \
|
||
*errnop = errno; \
|
||
H_ERRNO_SET (NETDB_INTERNAL); \
|
||
return status; \
|
||
} \
|
||
\
|
||
const struct nss_db_header *header = state.header; \
|
||
int i; \
|
||
for (i = 0; i < header->ndbs; ++i) \
|
||
if (header->dbs[i].id == db_char) \
|
||
break; \
|
||
if (i == header->ndbs) \
|
||
{ \
|
||
status = NSS_STATUS_UNAVAIL; \
|
||
goto out; \
|
||
} \
|
||
\
|
||
char *key; \
|
||
if (db_char == '.') \
|
||
key = (char *) IGNOREPATTERN keypattern; \
|
||
else \
|
||
{ \
|
||
const size_t size = (keysize) + 1; \
|
||
key = alloca (size); \
|
||
\
|
||
KEYPRINTF keypattern; \
|
||
} \
|
||
\
|
||
const stridx_t *hashtable \
|
||
= (const stridx_t *) ((const char *) header \
|
||
+ header->dbs[i].hashoffset); \
|
||
const char *valstrtab = (const char *) header + header->valstroffset; \
|
||
uint32_t hashval = __hash_string (key); \
|
||
size_t hidx = hashval % header->dbs[i].hashsize; \
|
||
size_t hval2 = 1 + hashval % (header->dbs[i].hashsize - 2); \
|
||
\
|
||
status = NSS_STATUS_NOTFOUND; \
|
||
while (hashtable[hidx] != ~((stridx_t) 0)) \
|
||
{ \
|
||
const char *valstr = valstrtab + hashtable[hidx]; \
|
||
size_t len = strlen (valstr) + 1; \
|
||
if (len > buflen) \
|
||
{ \
|
||
/* No room to copy the data to. */ \
|
||
*errnop = ERANGE; \
|
||
H_ERRNO_SET (NETDB_INTERNAL); \
|
||
status = NSS_STATUS_TRYAGAIN; \
|
||
break; \
|
||
} \
|
||
\
|
||
/* Copy the string to a place where it can be modified. */ \
|
||
char *p = memcpy (buffer, valstr, len); \
|
||
\
|
||
int err = parse_line (p, result, data, buflen, errnop EXTRA_ARGS); \
|
||
\
|
||
/* Advance before break_if_match, lest it uses continue to skip
|
||
to the next entry. */ \
|
||
if ((hidx += hval2) >= header->dbs[i].hashsize) \
|
||
hidx -= header->dbs[i].hashsize; \
|
||
\
|
||
if (err > 0) \
|
||
{ \
|
||
status = NSS_STATUS_SUCCESS; \
|
||
break_if_match; \
|
||
status = NSS_STATUS_NOTFOUND; \
|
||
} \
|
||
else if (err == -1) \
|
||
{ \
|
||
H_ERRNO_SET (NETDB_INTERNAL); \
|
||
status = NSS_STATUS_TRYAGAIN; \
|
||
break; \
|
||
} \
|
||
} \
|
||
\
|
||
if (status == NSS_STATUS_NOTFOUND) \
|
||
H_ERRNO_SET (HOST_NOT_FOUND); \
|
||
\
|
||
out: \
|
||
internal_endent (&state); \
|
||
\
|
||
return status; \
|
||
}
|
||
|
||
#define KEYPRINTF(pattern, args...) snprintf (key, size, pattern ,##args)
|
||
#define IGNOREPATTERN(pattern, arg1, args...) (char *) (uintptr_t) arg1
|
||
|
||
|
||
|
||
|
||
/* 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;
|
||
struct parser_data *data = (void *) buffer;
|
||
|
||
if (buflen < sizeof *data)
|
||
{
|
||
*errnop = ERANGE;
|
||
H_ERRNO_SET (NETDB_INTERNAL);
|
||
return NSS_STATUS_TRYAGAIN;
|
||
}
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
if (state.header == NULL)
|
||
{
|
||
status = internal_setent (DBFILE, &state);
|
||
if (status != NSS_STATUS_SUCCESS)
|
||
{
|
||
*errnop = errno;
|
||
H_ERRNO_SET (NETDB_INTERNAL);
|
||
goto out;
|
||
}
|
||
}
|
||
|
||
status = NSS_STATUS_UNAVAIL;
|
||
if (state.header != MAP_FAILED)
|
||
{
|
||
const char *const end = ((const char *) state.header
|
||
+ state.header->valstroffset
|
||
+ state.header->valstrlen);
|
||
while (entidx < end)
|
||
{
|
||
const char *next = rawmemchr (entidx, '\0') + 1;
|
||
size_t len = next - entidx;
|
||
|
||
if (len > buflen)
|
||
{
|
||
/* No room to copy the data to. */
|
||
*errnop = ERANGE;
|
||
H_ERRNO_SET (NETDB_INTERNAL);
|
||
status = NSS_STATUS_TRYAGAIN;
|
||
break;
|
||
}
|
||
|
||
/* Copy the string to a place where it can be modified. */
|
||
char *p = memcpy (buffer, entidx, len);
|
||
|
||
int err = parse_line (p, result, data, buflen, errnop EXTRA_ARGS);
|
||
|
||
if (err > 0)
|
||
{
|
||
status = NSS_STATUS_SUCCESS;
|
||
entidx = next;
|
||
break;
|
||
}
|
||
if (err < 0)
|
||
{
|
||
H_ERRNO_SET (HOST_NOT_FOUND);
|
||
status = NSS_STATUS_NOTFOUND;
|
||
break;
|
||
}
|
||
|
||
/* Continue with the next record, this one is ill-formed. */
|
||
entidx = next;
|
||
}
|
||
}
|
||
|
||
out:
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|