lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

nss: Turn __nss_database_lookup into a compatibility symbol

Browse Source 
The function uses the internal service_user type, so it is not
really usable from the outside of glibc.  Rename the function
to __nss_database_lookup2 for internal use, and change
__nss_database_lookup to always indicate failure to the caller.

__nss_next already was a compatibility symbol.  The new
implementation always fails and no longer calls __nss_next2.

unscd, the alternative nscd implementation, does not use
__nss_database_lookup, so it is not affected by this change.
This commit is contained in:
Florian Weimer
2019-05-15 13:51:35 +02:00
parent d50f09181e
commit a9368c34d7
15 changed files with 89 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nss/nsswitch.c
View File

@@ -115,8 +115,8 @@ static void (*nscd_init_cb) (size_t, struct traced_file *);
/* -1 == database not found
0 == database entry pointer stored */
int
__nss_database_lookup (const char *database, const char *alternate_name,
const char *defconfig, service_user **ni)
__nss_database_lookup2 (const char *database, const char *alternate_name,
const char *defconfig, service_user **ni)
{
/* Prevent multiple threads to change the service table. */
__libc_lock_lock (lock);
@@ -185,7 +185,7 @@ __nss_database_lookup (const char *database, const char *alternate_name,
return *ni != NULL ? 0 : -1;
}
libc_hidden_def (__nss_database_lookup)
libc_hidden_def (__nss_database_lookup2)
/* -1 == not found
@@ -260,16 +260,6 @@ __nss_next2 (service_user **ni, const char *fct_name, const char *fct2_name,
}
libc_hidden_def (__nss_next2)
int
attribute_compat_text_section
__nss_next (service_user **ni, const char *fct_name, void **fctp, int status,
int all_values)
{
return __nss_next2 (ni, fct_name, NULL, fctp, status, all_values);
}
int
__nss_configure_lookup (const char *dbname, const char *service_line)
{
@@ -835,7 +825,7 @@ nss_load_all_libraries (const char *service, const char *def)
{
service_user *ni = NULL;
if (__nss_database_lookup (service, NULL, def, &ni) == 0)
if (__nss_database_lookup2 (service, NULL, def, &ni) == 0)
while (ni != NULL)
{
nss_load_library (ni);