mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 06:20:06 +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.
357 lines
8.2 KiB
C
357 lines
8.2 KiB
C
/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
|
|
|
|
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 <atomic.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <inttypes.h>
|
|
#include <netdb.h>
|
|
#include <nss.h>
|
|
#include <string.h>
|
|
#include <netinet/ether.h>
|
|
#include <netinet/if_ether.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <libc-lock.h>
|
|
|
|
#include "nss-nisplus.h"
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
static nis_result *result;
|
|
static nis_name tablename_val;
|
|
static u_long tablename_len;
|
|
|
|
|
|
#define NISENTRYVAL(idx, col, res) \
|
|
(NIS_RES_OBJECT (res)[idx].zo_data.objdata_u.en_data.en_cols.en_cols_val[col].ec_value.ec_value_val)
|
|
|
|
#define NISENTRYLEN(idx, col, res) \
|
|
(NIS_RES_OBJECT (res)[idx].zo_data.objdata_u.en_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
|
|
|
|
static int
|
|
_nss_nisplus_parse_etherent (nis_result *result, struct etherent *ether,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
char *p = buffer;
|
|
size_t room_left = buflen;
|
|
|
|
if (result == NULL)
|
|
return 0;
|
|
|
|
if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS)
|
|
|| NIS_RES_NUMOBJ (result) != 1
|
|
|| __type_of (NIS_RES_OBJECT (result)) != NIS_ENTRY_OBJ
|
|
|| strcmp (NIS_RES_OBJECT (result)->EN_data.en_type,
|
|
"ethers_tbl") != 0
|
|
|| NIS_RES_OBJECT (result)->EN_data.en_cols.en_cols_len < 2)
|
|
return 0;
|
|
|
|
/* Generate the ether entry format and use the normal parser */
|
|
if (NISENTRYLEN (0, 0, result) + 1 > room_left)
|
|
{
|
|
*errnop = ERANGE;
|
|
return -1;
|
|
}
|
|
char *cp = __stpncpy (p, NISENTRYVAL (0, 0, result),
|
|
NISENTRYLEN (0, 0, result));
|
|
*cp = '\0';
|
|
room_left -= NISENTRYLEN (0, 0, result) + 1;
|
|
ether->e_name = p;
|
|
|
|
struct ether_addr *ea = ether_aton (NISENTRYVAL (0, 1, result));
|
|
if (ea == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return -2;
|
|
}
|
|
|
|
ether->e_addr = *ea;
|
|
|
|
return 1;
|
|
}
|
|
|
|
static enum nss_status
|
|
_nss_create_tablename (int *errnop)
|
|
{
|
|
if (tablename_val == NULL)
|
|
{
|
|
const char *local_dir = nis_local_directory ();
|
|
size_t local_dir_len = strlen (local_dir);
|
|
static const char prefix[] = "ethers.org_dir.";
|
|
|
|
char *p = malloc (sizeof (prefix) + local_dir_len);
|
|
if (p == NULL)
|
|
{
|
|
*errnop = errno;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
memcpy (__stpcpy (p, prefix), local_dir, local_dir_len + 1);
|
|
|
|
tablename_len = sizeof (prefix) - 1 + local_dir_len;
|
|
|
|
atomic_write_barrier ();
|
|
|
|
tablename_val = p;
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
|
|
enum nss_status
|
|
_nss_nisplus_setetherent (int stayopen)
|
|
{
|
|
enum nss_status status;
|
|
int err;
|
|
|
|
status = NSS_STATUS_SUCCESS;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (result != NULL)
|
|
{
|
|
nis_freeresult (result);
|
|
result = NULL;
|
|
}
|
|
|
|
if (_nss_create_tablename (&err) != NSS_STATUS_SUCCESS)
|
|
status = NSS_STATUS_UNAVAIL;
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_endetherent (void)
|
|
{
|
|
__libc_lock_lock (lock);
|
|
|
|
if (result != NULL)
|
|
{
|
|
nis_freeresult (result);
|
|
result = NULL;
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nisplus_getetherent_r (struct etherent *ether, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
if (tablename_val == NULL)
|
|
{
|
|
enum nss_status status = _nss_create_tablename (errnop);
|
|
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
}
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
int parse_res;
|
|
do
|
|
{
|
|
nis_result *saved_result;
|
|
|
|
if (result == NULL)
|
|
{
|
|
saved_result = NULL;
|
|
result = nis_first_entry (tablename_val);
|
|
if (result == NULL)
|
|
{
|
|
*errnop = errno;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
|
|
return niserr2nss (result->status);
|
|
}
|
|
else
|
|
{
|
|
saved_result = result;
|
|
result = nis_next_entry (tablename_val, &result->cookie);
|
|
if (result == NULL)
|
|
{
|
|
*errnop = errno;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
nis_freeresult (saved_result);
|
|
return niserr2nss (result->status);
|
|
}
|
|
}
|
|
|
|
parse_res = _nss_nisplus_parse_etherent (result, ether, buffer,
|
|
buflen, errnop);
|
|
if (parse_res == -1)
|
|
{
|
|
nis_freeresult (result);
|
|
result = saved_result;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
if (saved_result != NULL)
|
|
nis_freeresult (saved_result);
|
|
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_getetherent_r (struct etherent *result, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
int status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nisplus_getetherent_r (result, buffer, buflen, errnop);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_gethostton_r (const char *name, struct etherent *eth,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
if (tablename_val == NULL)
|
|
{
|
|
enum nss_status status = _nss_create_tablename (errnop);
|
|
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
}
|
|
|
|
if (name == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
char buf[strlen (name) + 9 + tablename_len];
|
|
int olderr = errno;
|
|
|
|
snprintf (buf, sizeof (buf), "[name=%s],%s", name, tablename_val);
|
|
|
|
nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
|
|
NULL, NULL);
|
|
|
|
if (result == NULL)
|
|
{
|
|
*errnop = ENOMEM;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
if (__glibc_unlikely (niserr2nss (result->status) != NSS_STATUS_SUCCESS))
|
|
{
|
|
enum nss_status status = niserr2nss (result->status);
|
|
nis_freeresult (result);
|
|
return status;
|
|
}
|
|
|
|
int parse_res = _nss_nisplus_parse_etherent (result, eth, buffer,
|
|
buflen, errnop);
|
|
|
|
/* We do not need the lookup result anymore. */
|
|
nis_freeresult (result);
|
|
|
|
if (__glibc_unlikely (parse_res < 1))
|
|
{
|
|
__set_errno (olderr);
|
|
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_getntohost_r (const struct ether_addr *addr, struct etherent *eth,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
if (tablename_val == NULL)
|
|
{
|
|
__libc_lock_lock (lock);
|
|
|
|
enum nss_status status = _nss_create_tablename (errnop);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
}
|
|
|
|
if (addr == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
char buf[26 + tablename_len];
|
|
|
|
snprintf (buf, sizeof (buf),
|
|
"[addr=%" PRIx8 ":%" PRIx8 ":%" PRIx8 ":%" PRIx8 ":%" PRIx8
|
|
":%" PRIx8 "],%s",
|
|
addr->ether_addr_octet[0], addr->ether_addr_octet[1],
|
|
addr->ether_addr_octet[2], addr->ether_addr_octet[3],
|
|
addr->ether_addr_octet[4], addr->ether_addr_octet[5],
|
|
tablename_val);
|
|
|
|
nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
|
|
NULL, NULL);
|
|
|
|
if (result == NULL)
|
|
{
|
|
*errnop = ENOMEM;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
if (__glibc_unlikely (niserr2nss (result->status) != NSS_STATUS_SUCCESS))
|
|
{
|
|
enum nss_status status = niserr2nss (result->status);
|
|
nis_freeresult (result);
|
|
return status;
|
|
}
|
|
|
|
int parse_res = _nss_nisplus_parse_etherent (result, eth, buffer,
|
|
buflen, errnop);
|
|
|
|
/* We do not need the lookup result anymore. */
|
|
nis_freeresult (result);
|
|
|
|
if (__glibc_unlikely (parse_res < 1))
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|