mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 16:21:07 +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.
439 lines
10 KiB
C
439 lines
10 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 <netdb.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <libc-lock.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
|
|
#include "nss-nis.h"
|
|
#include <libnsl.h>
|
|
|
|
|
|
/* Get the declaration of the parser function. */
|
|
#define ENTNAME servent
|
|
#define EXTERN_PARSER
|
|
#include <nss/nss_files/files-parse.c>
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
static intern_t intern;
|
|
|
|
struct search_t
|
|
{
|
|
const char *name;
|
|
const char *proto;
|
|
int port;
|
|
enum nss_status status;
|
|
struct servent *serv;
|
|
char *buffer;
|
|
size_t buflen;
|
|
int *errnop;
|
|
};
|
|
|
|
static int
|
|
dosearch (int instatus, char *inkey, int inkeylen, char *inval,
|
|
int invallen, char *indata)
|
|
{
|
|
struct search_t *req = (struct search_t *) indata;
|
|
|
|
if (__glibc_unlikely (instatus != YP_TRUE))
|
|
return 1;
|
|
|
|
if (inkey && inkeylen > 0 && inval && invallen > 0)
|
|
{
|
|
if (__glibc_unlikely ((size_t) (invallen + 1) > req->buflen))
|
|
{
|
|
*req->errnop = ERANGE;
|
|
req->status = NSS_STATUS_TRYAGAIN;
|
|
return 1;
|
|
}
|
|
|
|
char *p = strncpy (req->buffer, inval, invallen);
|
|
req->buffer[invallen] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
|
|
int parse_res = _nss_files_parse_servent (p, req->serv,
|
|
(void *) req->buffer,
|
|
req->buflen, req->errnop);
|
|
if (parse_res == -1)
|
|
{
|
|
req->status = NSS_STATUS_TRYAGAIN;
|
|
return 1;
|
|
}
|
|
|
|
if (!parse_res)
|
|
return 0;
|
|
|
|
if (req->proto != NULL && strcmp (req->serv->s_proto, req->proto) != 0)
|
|
return 0;
|
|
|
|
if (req->port != -1 && req->serv->s_port != req->port)
|
|
return 0;
|
|
|
|
if (req->name != NULL && strcmp (req->serv->s_name, req->name) != 0)
|
|
{
|
|
char **cp;
|
|
for (cp = req->serv->s_aliases; *cp; cp++)
|
|
if (strcmp (req->name, *cp) == 0)
|
|
break;
|
|
|
|
if (*cp == NULL)
|
|
return 0;
|
|
}
|
|
|
|
req->status = NSS_STATUS_SUCCESS;
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
internal_nis_endservent (void)
|
|
{
|
|
struct response_t *curr = intern.next;
|
|
|
|
while (curr != NULL)
|
|
{
|
|
struct response_t *last = curr;
|
|
curr = curr->next;
|
|
free (last);
|
|
}
|
|
|
|
intern.next = intern.start = NULL;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_endservent (void)
|
|
{
|
|
__libc_lock_lock (lock);
|
|
|
|
internal_nis_endservent ();
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_setservent (void)
|
|
{
|
|
char *domainname;
|
|
struct ypall_callback ypcb;
|
|
enum nss_status status;
|
|
|
|
if (yp_get_default_domain (&domainname))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
internal_nis_endservent ();
|
|
|
|
ypcb.foreach = _nis_saveit;
|
|
ypcb.data = (char *) &intern;
|
|
status = yperr2nss (yp_all (domainname, "services.byname", &ypcb));
|
|
|
|
/* Mark the last buffer as full. */
|
|
if (intern.next != NULL)
|
|
intern.next->size = intern.offset;
|
|
|
|
intern.next = intern.start;
|
|
intern.offset = 0;
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_setservent (int stayopen)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_setservent ();
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_getservent_r (struct servent *serv, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
struct parser_data *pdata = (void *) buffer;
|
|
int parse_res;
|
|
char *p;
|
|
|
|
if (intern.start == NULL)
|
|
internal_nis_setservent ();
|
|
|
|
if (intern.next == NULL)
|
|
/* Not one entry in the map. */
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
do
|
|
{
|
|
struct response_t *bucket = intern.next;
|
|
|
|
if (__glibc_unlikely (intern.offset >= bucket->size))
|
|
{
|
|
if (bucket->next == NULL)
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
/* We look at all the content in the current bucket. Go on
|
|
to the next. */
|
|
bucket = intern.next = bucket->next;
|
|
intern.offset = 0;
|
|
}
|
|
|
|
for (p = &bucket->mem[intern.offset]; isspace (*p); ++p)
|
|
++intern.offset;
|
|
|
|
size_t len = strlen (p) + 1;
|
|
if (__glibc_unlikely (len > buflen))
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
/* We unfortunately have to copy the data in the user-provided
|
|
buffer because that buffer might be around for a very long
|
|
time and the servent structure must remain valid. If we would
|
|
rely on the BUCKET memory the next 'setservent' or 'endservent'
|
|
call would destroy it.
|
|
|
|
The important thing is that it is a single NUL-terminated
|
|
string. This is what the parsing routine expects. */
|
|
p = memcpy (buffer, &bucket->mem[intern.offset], len);
|
|
|
|
parse_res = _nss_files_parse_servent (p, serv, pdata, buflen, errnop);
|
|
if (__glibc_unlikely (parse_res == -1))
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
intern.offset += len;
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservent_r (struct servent *serv, char *buffer, size_t buflen,
|
|
int *errnop)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_getservent_r (serv, buffer, buflen, errnop);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservbyname_r (const char *name, const char *protocol,
|
|
struct servent *serv, 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;
|
|
|
|
/* If the protocol is given, we could try if our NIS server knows
|
|
about services.byservicename map. If yes, we only need one query. */
|
|
size_t keylen = strlen (name) + (protocol ? 1 + strlen (protocol) : 0);
|
|
/* Limit key length to the maximum size of an RPC packet. */
|
|
if (keylen > UDPMSGSIZE)
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
char key[keylen + 1];
|
|
|
|
/* key is: "name/proto" */
|
|
char *cp = stpcpy (key, name);
|
|
if (protocol != NULL)
|
|
{
|
|
*cp++ = '/';
|
|
strcpy (cp, protocol);
|
|
}
|
|
|
|
char *result;
|
|
int int_len;
|
|
int status = yp_match (domain, "services.byservicename", key,
|
|
keylen, &result, &int_len);
|
|
size_t len = int_len;
|
|
|
|
/* If we found the key, it's ok and parse the result. If not,
|
|
fall through and parse the complete table. */
|
|
if (__glibc_likely (status == YPERR_SUCCESS))
|
|
{
|
|
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_servent (p, serv, (void *) buffer,
|
|
buflen, errnop);
|
|
if (__glibc_unlikely (parse_res < 0))
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
else
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
/* Check if it is safe to rely on services.byservicename. */
|
|
if (_nsl_default_nss () & NSS_FLAG_SERVICES_AUTHORITATIVE)
|
|
return yperr2nss (status);
|
|
|
|
struct ypall_callback ypcb;
|
|
struct search_t req;
|
|
|
|
ypcb.foreach = dosearch;
|
|
ypcb.data = (char *) &req;
|
|
req.name = name;
|
|
req.proto = protocol;
|
|
req.port = -1;
|
|
req.serv = serv;
|
|
req.buffer = buffer;
|
|
req.buflen = buflen;
|
|
req.errnop = errnop;
|
|
req.status = NSS_STATUS_NOTFOUND;
|
|
status = yp_all (domain, "services.byname", &ypcb);
|
|
|
|
if (__glibc_unlikely (status != YPERR_SUCCESS))
|
|
return yperr2nss (status);
|
|
|
|
return req.status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservbyport_r (int port, const char *protocol,
|
|
struct servent *serv, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
char *domain;
|
|
if (__glibc_unlikely (yp_get_default_domain (&domain)))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
/* If the protocol is given, we only need one query.
|
|
Otherwise try first port/tcp, then port/udp and then fallback
|
|
to sequential scanning of services.byname. */
|
|
const char *proto = protocol != NULL ? protocol : "tcp";
|
|
/* Limit protocol name length to the maximum size of an RPC packet. */
|
|
if (strlen (proto) > UDPMSGSIZE)
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
do
|
|
{
|
|
/* key is: "port/proto" */
|
|
char key[sizeof (int) * 3 + strlen (proto) + 2];
|
|
size_t keylen = snprintf (key, sizeof (key), "%d/%s", ntohs (port),
|
|
proto);
|
|
|
|
char *result;
|
|
int int_len;
|
|
int status = yp_match (domain, "services.byname", key, keylen, &result,
|
|
&int_len);
|
|
size_t len = int_len;
|
|
|
|
/* If we found the key, it's ok and parse the result. If not,
|
|
fall through and parse the complete table. */
|
|
if (__glibc_likely (status == YPERR_SUCCESS))
|
|
{
|
|
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_servent (p, serv, (void *) buffer,
|
|
buflen, errnop);
|
|
if (__glibc_unlikely (parse_res < 0))
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
else
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
}
|
|
while (protocol == NULL && (proto[0] == 't' ? (proto = "udp") : NULL));
|
|
|
|
if (port == -1)
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
struct ypall_callback ypcb;
|
|
struct search_t req;
|
|
|
|
ypcb.foreach = dosearch;
|
|
ypcb.data = (char *) &req;
|
|
req.name = NULL;
|
|
req.proto = protocol;
|
|
req.port = port;
|
|
req.serv = serv;
|
|
req.buffer = buffer;
|
|
req.buflen = buflen;
|
|
req.errnop = errnop;
|
|
req.status = NSS_STATUS_NOTFOUND;
|
|
int status = yp_all (domain, "services.byname", &ypcb);
|
|
|
|
if (__glibc_unlikely (status != YPERR_SUCCESS))
|
|
return yperr2nss (status);
|
|
|
|
return req.status;
|
|
}
|