diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/Versions | 8 | ||||
| -rw-r--r-- | nss/XXX-lookup.c | 4 | ||||
| -rw-r--r-- | nss/compat-lookup.c | 30 | ||||
| -rw-r--r-- | nss/nss_compat/compat-grp.c | 2 | ||||
| -rw-r--r-- | nss/nss_compat/compat-initgroups.c | 2 | ||||
| -rw-r--r-- | nss/nss_compat/compat-pwd.c | 2 | ||||
| -rw-r--r-- | nss/nss_compat/compat-spwd.c | 4 | ||||
| -rw-r--r-- | nss/nsswitch.c | 18 | ||||
| -rw-r--r-- | nss/nsswitch.h | 8 |
9 files changed, 49 insertions, 29 deletions
diff --git a/nss/Versions b/nss/Versions index db8c887720..afc82a23c2 100644 --- a/nss/Versions +++ b/nss/Versions @@ -1,8 +1,10 @@ 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; @@ -15,7 +17,7 @@ libc { __nss_passwd_lookup2; __nss_group_lookup2; __nss_hosts_lookup2; __nss_services_lookup2; __nss_next2; __nss_lookup; - __nss_hash; + __nss_hash; __nss_database_lookup2; } } diff --git a/nss/XXX-lookup.c b/nss/XXX-lookup.c index cb0900d68f..bc5f91adec 100644 --- a/nss/XXX-lookup.c +++ b/nss/XXX-lookup.c @@ -57,8 +57,8 @@ 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) + && __nss_database_lookup2 (DATABASE_NAME_STRING, ALTERNATE_NAME_STRING, + DEFAULT_CONFIG, &DATABASE_NAME_SYMBOL) < 0) return -1; *ni = DATABASE_NAME_SYMBOL; diff --git a/nss/compat-lookup.c b/nss/compat-lookup.c index 636b1bf184..79f7d96314 100644 --- a/nss/compat-lookup.c +++ b/nss/compat-lookup.c @@ -16,11 +16,12 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#include <nsswitch.h> + #include <shlib-compat.h> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_27) # include <errno.h> -# include <nsswitch.h> /* On i386, the function calling convention changed from the standard ABI calling convention to three register parameters in glibc 2.8. @@ -40,3 +41,30 @@ strong_alias (__nss_passwd_lookup, __nss_hosts_lookup) 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 --git a/nss/nss_compat/compat-grp.c b/nss/nss_compat/compat-grp.c index 24e499cc99..8f01e44a72 100644 --- a/nss/nss_compat/compat-grp.c +++ b/nss/nss_compat/compat-grp.c @@ -78,7 +78,7 @@ static bool in_blacklist (const char *, int, ent_t *); 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 --git a/nss/nss_compat/compat-initgroups.c b/nss/nss_compat/compat-initgroups.c index 318144b66b..b1df6a4e43 100644 --- a/nss/nss_compat/compat-initgroups.c +++ b/nss/nss_compat/compat-initgroups.c @@ -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 --git a/nss/nss_compat/compat-pwd.c b/nss/nss_compat/compat-pwd.c index bf9786179b..37f883f35a 100644 --- a/nss/nss_compat/compat-pwd.c +++ b/nss/nss_compat/compat-pwd.c @@ -88,7 +88,7 @@ static bool in_blacklist (const char *, int, ent_t *); 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 --git a/nss/nss_compat/compat-spwd.c b/nss/nss_compat/compat-spwd.c index c5e04cb967..bd310ab9aa 100644 --- a/nss/nss_compat/compat-spwd.c +++ b/nss/nss_compat/compat-spwd.c @@ -85,8 +85,8 @@ static bool in_blacklist (const char *, int, ent_t *); 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 --git a/nss/nsswitch.c b/nss/nsswitch.c index 3d828f9a21..c4a9ffb575 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -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); diff --git a/nss/nsswitch.h b/nss/nsswitch.h index 475e007e33..79a874e9d6 100644 --- a/nss/nsswitch.h +++ b/nss/nsswitch.h @@ -125,10 +125,10 @@ extern bool __nss_database_custom[NSS_DBSIDX_max] attribute_hidden; 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 |