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/ether_ntoh.c | |
parent | 2a124c616384f140a21ee675b3e6799f8e0e7592 (diff) | |
download | glibc-c88ffc239e8d8820f6d1d4e185984e6093a1e4d7.tar.gz |
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/ether_ntoh.c')
-rw-r--r-- | inet/ether_ntoh.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/inet/ether_ntoh.c b/inet/ether_ntoh.c index b2f7422ace..393601ee7a 100644 --- a/inet/ether_ntoh.c +++ b/inet/ether_ntoh.c @@ -28,11 +28,6 @@ typedef int (*lookup_function) (const struct ether_addr *, struct etherent *, char *, size_t, int *); -/* The lookup function for the first entry of this service. */ -extern int __nss_ethers_lookup (service_user **nip, const char *name, - void **fctp) internal_function; - - int ether_ntohost (char *hostname, const struct ether_addr *addr) { @@ -50,7 +45,7 @@ ether_ntohost (char *hostname, const struct ether_addr *addr) if (startp == NULL) { - no_more = __nss_ethers_lookup (&nip, "getntohost_r", &fct.ptr); + no_more = __nss_ethers_lookup2 (&nip, "getntohost_r", NULL, &fct.ptr); if (no_more) startp = (service_user *) -1; else |