commit a9368c34d70cef91ca59b09941f496df11d6b146 Author: Florian Weimer Date: Wed May 15 13:51:35 2019 +0200 nss: Turn __nss_database_lookup into a compatibility symbol 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. DJ - Added 2.30 clause to nss/Versions as RHEL 8 will always be 2.28. diff -rup a/grp/initgroups.c b/grp/initgroups.c --- a/grp/initgroups.c 2019-06-06 17:15:32.184092617 -0400 +++ b/grp/initgroups.c 2019-06-06 17:16:59.136114679 -0400 @@ -79,12 +79,12 @@ internal_getgrouplist (const char *user, if (__nss_initgroups_database == NULL) { - if (__nss_database_lookup ("initgroups", NULL, "", - &__nss_initgroups_database) < 0) + if (__nss_database_lookup2 ("initgroups", NULL, "", + &__nss_initgroups_database) < 0) { if (__nss_group_database == NULL) - no_more = __nss_database_lookup ("group", NULL, DEFAULT_CONFIG, - &__nss_group_database); + no_more = __nss_database_lookup2 ("group", NULL, DEFAULT_CONFIG, + &__nss_group_database); __nss_initgroups_database = __nss_group_database; } diff -rup a/nscd/aicache.c b/nscd/aicache.c --- a/nscd/aicache.c 2018-08-01 01:10:47.000000000 -0400 +++ b/nscd/aicache.c 2019-06-06 17:16:59.501114771 -0400 @@ -93,9 +93,9 @@ addhstaiX (struct database_dyn *db, int int herrno = 0; if (hosts_database == NULL) - no_more = __nss_database_lookup ("hosts", NULL, - "dns [!UNAVAIL=return] files", - &hosts_database); + no_more = __nss_database_lookup2 ("hosts", NULL, + "dns [!UNAVAIL=return] files", + &hosts_database); else no_more = 0; nip = hosts_database; diff -rup a/nscd/initgrcache.c b/nscd/initgrcache.c --- a/nscd/initgrcache.c 2019-06-06 17:15:32.205092622 -0400 +++ b/nscd/initgrcache.c 2019-06-06 17:16:59.510114774 -0400 @@ -88,8 +88,8 @@ addinitgroupsX (struct database_dyn *db, int no_more; if (group_database == NULL) - no_more = __nss_database_lookup ("group", NULL, DEFAULT_CONFIG, - &group_database); + no_more = __nss_database_lookup2 ("group", NULL, DEFAULT_CONFIG, + &group_database); else no_more = 0; nip = group_database; diff -rup a/nscd/netgroupcache.c b/nscd/netgroupcache.c --- a/nscd/netgroupcache.c 2019-06-06 17:15:32.151092608 -0400 +++ b/nscd/netgroupcache.c 2019-06-06 17:16:59.514114775 -0400 @@ -143,7 +143,7 @@ addgetnetgrentX (struct database_dyn *db *tofreep = NULL; if (netgroup_database == NULL - && __nss_database_lookup ("netgroup", NULL, NULL, &netgroup_database)) + && __nss_database_lookup2 ("netgroup", NULL, NULL, &netgroup_database)) { /* No such service. */ cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout, diff -rup a/nss/Versions b/nss/Versions --- a/nss/Versions 2018-08-01 01:10:47.000000000 -0400 +++ b/nss/Versions 2019-06-10 16:59:34.920054974 -0400 @@ -1,21 +1,26 @@ libc { GLIBC_2.0 { - # functions used in other libraries + __nss_configure_lookup; + + # Functions exported as no-op compat symbols. __nss_passwd_lookup; __nss_group_lookup; __nss_hosts_lookup; __nss_next; - __nss_database_lookup; __nss_configure_lookup; + __nss_database_lookup; } GLIBC_2.2.2 { __nss_hostname_digits_dots; } GLIBC_2.27 { } + GLIBC_2.30 { + # Added for rhbz 1710894 + } GLIBC_PRIVATE { _nss_files_parse_grent; _nss_files_parse_pwent; _nss_files_parse_spent; __nss_disable_nscd; __nss_lookup_function; _nss_files_parse_sgent; __nss_passwd_lookup2; __nss_group_lookup2; __nss_hosts_lookup2; __nss_services_lookup2; __nss_next2; __nss_lookup; - __nss_hash; + __nss_hash; __nss_database_lookup2; } } diff -rup a/nss/XXX-lookup.c b/nss/XXX-lookup.c --- a/nss/XXX-lookup.c 2018-08-01 01:10:47.000000000 -0400 +++ b/nss/XXX-lookup.c 2019-06-06 17:16:59.562114786 -0400 @@ -57,8 +57,8 @@ DB_LOOKUP_FCT (service_user **ni, const void **fctp) { if (DATABASE_NAME_SYMBOL == NULL - && __nss_database_lookup (DATABASE_NAME_STRING, ALTERNATE_NAME_STRING, - DEFAULT_CONFIG, &DATABASE_NAME_SYMBOL) < 0) + && __nss_database_lookup2 (DATABASE_NAME_STRING, ALTERNATE_NAME_STRING, + DEFAULT_CONFIG, &DATABASE_NAME_SYMBOL) < 0) return -1; *ni = DATABASE_NAME_SYMBOL; diff -rup a/nss/compat-lookup.c b/nss/compat-lookup.c --- a/nss/compat-lookup.c 2018-08-01 01:10:47.000000000 -0400 +++ b/nss/compat-lookup.c 2019-06-07 22:14:09.057668330 -0400 @@ -16,11 +16,12 @@ License along with the GNU C Library; if not, see . */ +#include + #include #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_27) # include -# include /* On i386, the function calling convention changed from the standard ABI calling convention to three register parameters in glibc 2.8. @@ -40,3 +41,31 @@ strong_alias (__nss_passwd_lookup, __nss compat_symbol (libc, __nss_hosts_lookup, __nss_hosts_lookup, GLIBC_2_0); #endif /* SHLIB_COMPAT */ + + +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_30) + +/* These functions were exported under a non-GLIBC_PRIVATE version, + even though it is not usable externally due to the service_user + type dependency. */ + +int +attribute_compat_text_section +__nss_next (service_user **ni, const char *fct_name, void **fctp, int status, + int all_values) +{ + return -1; +} +compat_symbol (libc, __nss_next, __nss_next, GLIBC_2_0); + +int +attribute_compat_text_section +__nss_database_lookup (const char *database, const char *alternate_name, + const char *defconfig, service_user **ni) +{ + *ni = NULL; + return -1; +} +compat_symbol (libc, __nss_database_lookup, __nss_database_lookup, GLIBC_2_0); + +#endif /* SHLIB_COMPAT */ diff -rup a/nss/nss_compat/compat-grp.c b/nss/nss_compat/compat-grp.c --- a/nss/nss_compat/compat-grp.c 2018-08-01 01:10:47.000000000 -0400 +++ b/nss/nss_compat/compat-grp.c 2019-06-06 17:16:59.618114799 -0400 @@ -78,7 +78,7 @@ static bool in_blacklist (const char *, static void init_nss_interface (void) { - if (__nss_database_lookup ("group_compat", NULL, "nis", &ni) >= 0) + if (__nss_database_lookup2 ("group_compat", NULL, "nis", &ni) >= 0) { nss_setgrent = __nss_lookup_function (ni, "setgrent"); nss_getgrnam_r = __nss_lookup_function (ni, "getgrnam_r"); diff -rup a/nss/nss_compat/compat-initgroups.c b/nss/nss_compat/compat-initgroups.c --- a/nss/nss_compat/compat-initgroups.c 2018-08-01 01:10:47.000000000 -0400 +++ b/nss/nss_compat/compat-initgroups.c 2019-06-06 17:16:59.646114807 -0400 @@ -89,7 +89,7 @@ init_nss_interface (void) /* Retest. */ if (ni == NULL - && __nss_database_lookup ("group_compat", NULL, "nis", &ni) >= 0) + && __nss_database_lookup2 ("group_compat", NULL, "nis", &ni) >= 0) { nss_initgroups_dyn = __nss_lookup_function (ni, "initgroups_dyn"); nss_getgrnam_r = __nss_lookup_function (ni, "getgrnam_r"); diff -rup a/nss/nss_compat/compat-pwd.c b/nss/nss_compat/compat-pwd.c --- a/nss/nss_compat/compat-pwd.c 2018-08-01 01:10:47.000000000 -0400 +++ b/nss/nss_compat/compat-pwd.c 2019-06-06 17:16:59.654114809 -0400 @@ -88,7 +88,7 @@ static bool in_blacklist (const char *, static void init_nss_interface (void) { - if (__nss_database_lookup ("passwd_compat", NULL, "nis", &ni) >= 0) + if (__nss_database_lookup2 ("passwd_compat", NULL, "nis", &ni) >= 0) { nss_setpwent = __nss_lookup_function (ni, "setpwent"); nss_getpwnam_r = __nss_lookup_function (ni, "getpwnam_r"); diff -rup a/nss/nss_compat/compat-spwd.c b/nss/nss_compat/compat-spwd.c --- a/nss/nss_compat/compat-spwd.c 2018-08-01 01:10:47.000000000 -0400 +++ b/nss/nss_compat/compat-spwd.c 2019-06-06 17:16:59.668114812 -0400 @@ -85,8 +85,8 @@ static bool in_blacklist (const char *, static void init_nss_interface (void) { - if (__nss_database_lookup ("shadow_compat", "passwd_compat", - "nis", &ni) >= 0) + if (__nss_database_lookup2 ("shadow_compat", "passwd_compat", + "nis", &ni) >= 0) { nss_setspent = __nss_lookup_function (ni, "setspent"); nss_getspnam_r = __nss_lookup_function (ni, "getspnam_r"); diff -rup a/nss/nsswitch.c b/nss/nsswitch.c --- a/nss/nsswitch.c 2019-06-06 17:15:32.210092623 -0400 +++ b/nss/nsswitch.c 2019-06-06 17:16:59.672114813 -0400 @@ -115,8 +115,8 @@ static void (*nscd_init_cb) (size_t, str /* -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 *datab 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 ch } 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 *serv { 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); diff -rup a/nss/nsswitch.h b/nss/nsswitch.h --- a/nss/nsswitch.h 2018-08-01 01:10:47.000000000 -0400 +++ b/nss/nsswitch.h 2019-06-06 17:16:59.691114818 -0400 @@ -125,10 +125,10 @@ extern bool __nss_database_custom[NSS_DB If there is no configuration for this database in the file, parse a service list from DEFCONFIG and use that. More than one function can use the database. */ -extern int __nss_database_lookup (const char *database, - const char *alternative_name, - const char *defconfig, service_user **ni); -libc_hidden_proto (__nss_database_lookup) +extern int __nss_database_lookup2 (const char *database, + const char *alternative_name, + const char *defconfig, service_user **ni); +libc_hidden_proto (__nss_database_lookup2) /* Put first function with name FCT_NAME for SERVICE in FCTP. The position is remembered in NI. The function returns a value < 0 if diff -rup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c --- a/sysdeps/posix/getaddrinfo.c 2018-08-01 01:10:47.000000000 -0400 +++ b/sysdeps/posix/getaddrinfo.c 2019-06-06 17:16:59.724114827 -0400 @@ -737,9 +737,9 @@ gaih_inet (const char *name, const struc #endif if (__nss_hosts_database == NULL) - no_more = __nss_database_lookup ("hosts", NULL, - "dns [!UNAVAIL=return] files", - &__nss_hosts_database); + no_more = __nss_database_lookup2 ("hosts", NULL, + "dns [!UNAVAIL=return] files", + &__nss_hosts_database); else no_more = 0; nip = __nss_hosts_database;