mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 20: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.
293 lines
6.4 KiB
C
293 lines
6.4 KiB
C
/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
|
|
|
|
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 <nss.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <libc-lock.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
#include <netinet/ether.h>
|
|
#include <netinet/if_ether.h>
|
|
|
|
#include "nss-nis.h"
|
|
|
|
/* Protect global state against multiple changers */
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
/* Get the declaration of the parser function. */
|
|
#define ENTNAME etherent
|
|
#define STRUCTURE etherent
|
|
#define EXTERN_PARSER
|
|
#include <nss/nss_files/files-parse.c>
|
|
|
|
struct response
|
|
{
|
|
struct response *next;
|
|
char val[0];
|
|
};
|
|
|
|
static struct response *start;
|
|
static struct response *next;
|
|
|
|
static int
|
|
saveit (int instatus, char *inkey, int inkeylen, char *inval,
|
|
int invallen, char *indata)
|
|
{
|
|
if (instatus != YP_TRUE)
|
|
return 1;
|
|
|
|
if (inkey && inkeylen > 0 && inval && invallen > 0)
|
|
{
|
|
struct response *newp = malloc (sizeof (struct response) + invallen + 1);
|
|
if (newp == NULL)
|
|
return 1; /* We have no error code for out of memory */
|
|
|
|
if (start == NULL)
|
|
start = newp;
|
|
else
|
|
next->next = newp;
|
|
next = newp;
|
|
|
|
newp->next = NULL;
|
|
*((char *) mempcpy (newp->val, inval, invallen)) = '\0';
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
internal_nis_endetherent (void)
|
|
{
|
|
while (start != NULL)
|
|
{
|
|
next = start;
|
|
start = start->next;
|
|
free (next);
|
|
}
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_endetherent (void)
|
|
{
|
|
__libc_lock_lock (lock);
|
|
|
|
internal_nis_endetherent ();
|
|
next = NULL;
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_setetherent (void)
|
|
{
|
|
char *domainname;
|
|
struct ypall_callback ypcb;
|
|
enum nss_status status;
|
|
|
|
yp_get_default_domain (&domainname);
|
|
|
|
internal_nis_endetherent ();
|
|
|
|
ypcb.foreach = saveit;
|
|
ypcb.data = NULL;
|
|
status = yperr2nss (yp_all (domainname, "ethers.byname", &ypcb));
|
|
next = start;
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_setetherent (int stayopen)
|
|
{
|
|
enum nss_status result;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
result = internal_nis_setetherent ();
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_getetherent_r (struct etherent *eth, char *buffer, size_t buflen,
|
|
int *errnop)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
int parse_res;
|
|
|
|
if (start == NULL)
|
|
internal_nis_setetherent ();
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
do
|
|
{
|
|
char *p;
|
|
|
|
if (next == NULL)
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
p = strncpy (buffer, next->val, buflen);
|
|
|
|
while (isspace (*p))
|
|
++p;
|
|
|
|
parse_res = _nss_files_parse_etherent (p, eth, data, buflen, errnop);
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
next = next->next;
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getetherent_r (struct etherent *result, char *buffer, size_t buflen,
|
|
int *errnop)
|
|
{
|
|
int status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_getetherent_r (result, buffer, buflen, errnop);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_gethostton_r (const char *name, struct etherent *eth,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
if (name == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
char *domain;
|
|
if (__glibc_unlikely (yp_get_default_domain (&domain)))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
char *result;
|
|
int len;
|
|
int yperr = yp_match (domain, "ethers.byname", name, strlen (name), &result,
|
|
&len);
|
|
|
|
if (__glibc_unlikely (yperr != YPERR_SUCCESS))
|
|
{
|
|
enum nss_status retval = yperr2nss (yperr);
|
|
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
*errnop = errno;
|
|
return retval;
|
|
}
|
|
|
|
if (__glibc_unlikely ((size_t) (len + 1) > buflen))
|
|
{
|
|
free (result);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
char *p = strncpy (buffer, result, len);
|
|
buffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
|
|
int parse_res = _nss_files_parse_etherent (p, eth, (void *) buffer, buflen,
|
|
errnop);
|
|
if (__glibc_unlikely (parse_res < 1))
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
else
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getntohost_r (const struct ether_addr *addr, struct etherent *eth,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
if (addr == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
char *domain;
|
|
if (__glibc_unlikely (yp_get_default_domain (&domain)))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
char buf[33];
|
|
int nlen = snprintf (buf, sizeof (buf), "%x:%x:%x:%x:%x:%x",
|
|
(int) addr->ether_addr_octet[0],
|
|
(int) addr->ether_addr_octet[1],
|
|
(int) addr->ether_addr_octet[2],
|
|
(int) addr->ether_addr_octet[3],
|
|
(int) addr->ether_addr_octet[4],
|
|
(int) addr->ether_addr_octet[5]);
|
|
|
|
char *result;
|
|
int len;
|
|
int yperr = yp_match (domain, "ethers.byaddr", buf, nlen, &result, &len);
|
|
|
|
if (__glibc_unlikely (yperr != YPERR_SUCCESS))
|
|
{
|
|
enum nss_status retval = yperr2nss (yperr);
|
|
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
*errnop = errno;
|
|
return retval;
|
|
}
|
|
|
|
if (__glibc_unlikely ((size_t) (len + 1) > buflen))
|
|
{
|
|
free (result);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
char *p = strncpy (buffer, result, len);
|
|
buffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
|
|
int parse_res = _nss_files_parse_etherent (p, eth, (void *) buffer, buflen,
|
|
errnop);
|
|
if (__glibc_unlikely (parse_res < 1))
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
else
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|