diff options
author | Florian Weimer <fweimer@redhat.com> | 2017-08-14 17:12:05 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2017-08-14 18:13:42 +0200 |
commit | c88ffc239e8d8820f6d1d4e185984e6093a1e4d7 (patch) | |
tree | 9702ec03e78de2550e98d6e5a75b8f7b218bcd7c /inet/getnetgrent_r.c | |
parent | 2a124c616384f140a21ee675b3e6799f8e0e7592 (diff) | |
download | glibc-c88ffc239e8d8820f6d1d4e185984e6093a1e4d7.tar.gz glibc-c88ffc239e8d8820f6d1d4e185984e6093a1e4d7.tar.xz glibc-c88ffc239e8d8820f6d1d4e185984e6093a1e4d7.zip |
NSS: Replace exported NSS lookup functions with stubs [BZ #21962]
Commit 384ca551743318bd9c9e24a496d6397f2e3f2a49 from 2007 added this to nss/XXX-lookup.c: +#ifndef NO_COMPAT +int +internal_function attribute_compat_text_section +DB_COMPAT_FCT (service_user **ni, const char *fct_name, void **fctp) +{ + return DB_LOOKUP_FCT (ni, fct_name, NULL, fctp); +} +#endif That is, it adds a pseudo-compat function with an internal_function attribute. The function it was supposed to replace did not have the attribute: extern int DB_LOOKUP_FCT (service_user **ni, const char *fct_name, - void **fctp) internal_function; + const char *fct2_name, void **fctp) + internal_function; This changed the calling convention on i386 for the following functions in the public ABI: __nss_passwd_lookup __nss_group_lookup __nss_hosts_lookup This commit replaces the functions with always-failing stubs, with true compat symbols. Due to a happy accident, the calling convention of the stub is identical for the internal_function and non-internal_function case on i386. In addition, this commit auto-generates the __nss_*_lookup2 function declarations as part of <nsswitch.h>.
Diffstat (limited to 'inet/getnetgrent_r.c')
-rw-r--r-- | inet/getnetgrent_r.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c index a8fc51c1b6..89fefeb612 100644 --- a/inet/getnetgrent_r.c +++ b/inet/getnetgrent_r.c @@ -36,10 +36,6 @@ __libc_lock_define_initialized (static, lock) kept in this structure. */ static struct __netgrent dataset; -/* The lookup function for the first entry of this service. */ -extern int __nss_netgroup_lookup (service_user **nipp, const char *name, - void **fctp) internal_function; - /* Set up NIP to run through the services. Return nonzero if there are no services (left). */ static int @@ -54,7 +50,7 @@ setup (void **fctp, service_user **nipp) { /* Executing this more than once at the same time must yield the same result every time. So we need no locking. */ - no_more = __nss_netgroup_lookup (nipp, "setnetgrent", fctp); + no_more = __nss_netgroup_lookup2 (nipp, "setnetgrent", NULL, fctp); startp = no_more ? (service_user *) -1 : *nipp; #ifdef PTR_MANGLE PTR_MANGLE (startp); |