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 /nss/XXX-lookup.c | |
parent | 2a124c616384f140a21ee675b3e6799f8e0e7592 (diff) | |
download | glibc-c88ffc239e8d8820f6d1d4e185984e6093a1e4d7.tar glibc-c88ffc239e8d8820f6d1d4e185984e6093a1e4d7.tar.gz glibc-c88ffc239e8d8820f6d1d4e185984e6093a1e4d7.tar.bz2 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 'nss/XXX-lookup.c')
-rw-r--r-- | nss/XXX-lookup.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/nss/XXX-lookup.c b/nss/XXX-lookup.c index 972a2102bf..49417691b2 100644 --- a/nss/XXX-lookup.c +++ b/nss/XXX-lookup.c @@ -34,7 +34,6 @@ \*******************************************************************/ #define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup2) -#define DB_COMPAT_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup) #define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post) #define CONCAT3_2(Pre, Name, Post) Pre##Name##Post @@ -55,10 +54,6 @@ service_user *DATABASE_NAME_SYMBOL attribute_hidden; -extern int DB_LOOKUP_FCT (service_user **ni, const char *fct_name, - const char *fct2_name, void **fctp); -libc_hidden_proto (DB_LOOKUP_FCT) - int DB_LOOKUP_FCT (service_user **ni, const char *fct_name, const char *fct2_name, void **fctp) @@ -73,13 +68,3 @@ DB_LOOKUP_FCT (service_user **ni, const char *fct_name, const char *fct2_name, return __nss_lookup (ni, fct_name, fct2_name, fctp); } libc_hidden_def (DB_LOOKUP_FCT) - - -#ifndef NO_COMPAT -int -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 |