mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50:07 +00:00
1dbbb1ec7a
Mark internal nss symbols with attribute_hidden to allow direct access within libc.so and libc.a without using GOT nor PLT. Tested on x86-64 with and without --disable-nscd. [BZ #18822] * grp/initgroups.c (__nss_group_database): Removed. (__nss_initgroups_database): Likewise. * nscd/gai.c (__nss_hosts_database): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * posix/tst-rfc3484-2.c (__nss_hosts_database): Likewise. * posix/tst-rfc3484-3.c (__nss_hosts_database): Likewise. * posix/tst-rfc3484.c (__nss_hosts_database): Likewise. * sysdeps/posix/getaddrinfo.c (__nss_hosts_database): Likewise. * nss/getXXent.c (INTERNAL (REENTRANT_GETNAME)): Add attribute_hidden. * nss/nsswitch.c (__nss_database_custom): Define only if USE_NSCD is defined. (__nss_configure_lookup): Use __nss_database_custom only if USE_NSCD is defined. * nss/nsswitch.h (__nss_database_custom): Declare only if USE_NSCD is defined. Add attribute_hidden. (__nss_setent): Add attribute_hidden. (__nss_endent): Likewise. (__nss_getent_r): Likewise. (__nss_getent): Likewise. (DEFINE_DATABASE): Declare __nss_##arg##_database.
69 lines
2.4 KiB
C
69 lines
2.4 KiB
C
/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 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 "nsswitch.h"
|
|
|
|
/*******************************************************************\
|
|
|* Here we assume one symbol to be defined: *|
|
|
|* *|
|
|
|* DATABASE_NAME - name of the database the function accesses *|
|
|
|* (e.g., hosts, services, ...) *|
|
|
|* *|
|
|
|* One additional symbol may optionally be defined: *|
|
|
|* *|
|
|
|* ALTERNATE_NAME - name of another service which is examined in *|
|
|
|* case DATABASE_NAME is not found *|
|
|
|* *|
|
|
|* DEFAULT_CONFIG - string for default conf (e.g. "dns files") *|
|
|
|* *|
|
|
\*******************************************************************/
|
|
|
|
#define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup2)
|
|
#define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
|
|
#define CONCAT3_2(Pre, Name, Post) Pre##Name##Post
|
|
|
|
#define DATABASE_NAME_SYMBOL CONCAT3_1 (__nss_, DATABASE_NAME, _database)
|
|
#define DATABASE_NAME_STRING STRINGIFY1 (DATABASE_NAME)
|
|
#define STRINGIFY1(Name) STRINGIFY2 (Name)
|
|
#define STRINGIFY2(Name) #Name
|
|
|
|
#ifdef ALTERNATE_NAME
|
|
#define ALTERNATE_NAME_STRING STRINGIFY1 (ALTERNATE_NAME)
|
|
#else
|
|
#define ALTERNATE_NAME_STRING NULL
|
|
#endif
|
|
|
|
#ifndef DEFAULT_CONFIG
|
|
#define DEFAULT_CONFIG NULL
|
|
#endif
|
|
|
|
int
|
|
DB_LOOKUP_FCT (service_user **ni, const char *fct_name, const char *fct2_name,
|
|
void **fctp)
|
|
{
|
|
if (DATABASE_NAME_SYMBOL == NULL
|
|
&& __nss_database_lookup (DATABASE_NAME_STRING, ALTERNATE_NAME_STRING,
|
|
DEFAULT_CONFIG, &DATABASE_NAME_SYMBOL) < 0)
|
|
return -1;
|
|
|
|
*ni = DATABASE_NAME_SYMBOL;
|
|
|
|
return __nss_lookup (ni, fct_name, fct2_name, fctp);
|
|
}
|
|
libc_hidden_def (DB_LOOKUP_FCT)
|