From c88ffc239e8d8820f6d1d4e185984e6093a1e4d7 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 14 Aug 2017 17:12:05 +0200 Subject: 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 . --- nss/XXX-lookup.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'nss/XXX-lookup.c') diff --git a/nss/XXX-lookup.c b/nss/XXX-lookup.c index 972a210..4941769 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 -- cgit v1.1