about summary refs log tree commit diff
path: root/inet
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-08-13 21:10:56 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-08-13 21:10:56 +0200
commitb22974092d09a61fdb371b28837175bb616e78cf (patch)
treef8c79d98833f256948b47fd3a64240c7c5f0e775 /inet
parent1b0bfc6946b460bcebe9db19a015f2cac711f7f5 (diff)
downloadglibc-b22974092d09a61fdb371b28837175bb616e78cf.tar.gz
glibc-b22974092d09a61fdb371b28837175bb616e78cf.tar.xz
glibc-b22974092d09a61fdb371b28837175bb616e78cf.zip
NSS: Do not use internal_function for functions with hidden aliases
Such functions are called across DSO boundaries and should not
use a non-standard ABI.
Diffstat (limited to 'inet')
-rw-r--r--inet/getnetgrent_r.c3
-rw-r--r--inet/netgroup.h9
2 files changed, 3 insertions, 9 deletions
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 1b4eb65b89..a8fc51c1b6 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -172,7 +172,6 @@ __internal_setnetgrent_reuse (const char *group, struct __netgrent *datap,
 }
 
 int
-internal_function
 __internal_setnetgrent (const char *group, struct __netgrent *datap)
 {
   /* Free list of all netgroup names from last run.  */
@@ -214,7 +213,6 @@ setnetgrent (const char *group)
 }
 
 void
-internal_function
 __internal_endnetgrent (struct __netgrent *datap)
 {
   endnetgrent_hook (datap);
@@ -263,7 +261,6 @@ nscd_getnetgrent (struct __netgrent *datap, char *buffer, size_t buflen,
 #endif
 
 int
-internal_function
 __internal_getnetgrent_r (char **hostp, char **userp, char **domainp,
 			  struct __netgrent *datap,
 			  char *buffer, size_t buflen, int *errnop)
diff --git a/inet/netgroup.h b/inet/netgroup.h
index 9ad9dfe144..630d2b768a 100644
--- a/inet/netgroup.h
+++ b/inet/netgroup.h
@@ -70,16 +70,13 @@ struct __netgrent
 
 /* The internal netgroup handling functions might be called from outside.  */
 extern int __internal_setnetgrent (const char *group,
-				   struct __netgrent *datap)
-  internal_function;
+				   struct __netgrent *datap);
 libc_hidden_proto (__internal_setnetgrent)
-extern void __internal_endnetgrent (struct __netgrent *datap)
-  internal_function;
+extern void __internal_endnetgrent (struct __netgrent *datap);
 libc_hidden_proto (__internal_endnetgrent)
 extern int __internal_getnetgrent_r (char **hostp, char **userp,
 				     char **domainp, struct __netgrent *datap,
-				     char *buffer, size_t buflen, int *errnop)
-  internal_function;
+				     char *buffer, size_t buflen, int *errnop);
 libc_hidden_proto (__internal_getnetgrent_r)
 
 #endif /* netgroup.h */