summary refs log tree commit diff
path: root/grp
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-08-14 17:12:05 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-08-14 18:13:42 +0200
commitc88ffc239e8d8820f6d1d4e185984e6093a1e4d7 (patch)
tree9702ec03e78de2550e98d6e5a75b8f7b218bcd7c /grp
parent2a124c616384f140a21ee675b3e6799f8e0e7592 (diff)
downloadglibc-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 'grp')
-rw-r--r--grp/initgroups.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/grp/initgroups.c b/grp/initgroups.c
index 7a40813d5e..0d5b841796 100644
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -36,11 +36,6 @@ typedef enum nss_status (*initgroups_dyn_function) (const char *, gid_t,
 						    long int *, long int *,
 						    gid_t **, long int, int *);
 
-/* The lookup function for the first entry of this service.  */
-extern int __nss_group_lookup (service_user **nip, const char *name,
-				   void **fctp);
-extern void *__nss_lookup_function (service_user *ni, const char *fct_name);
-
 extern service_user *__nss_group_database attribute_hidden;
 service_user *__nss_initgroups_database;
 static bool use_initgroups_entry;