summary refs log tree commit diff
path: root/grp
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 /grp
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 'grp')
-rw-r--r--grp/grp-merge.c2
-rw-r--r--grp/grp-merge.h6
2 files changed, 2 insertions, 6 deletions
diff --git a/grp/grp-merge.c b/grp/grp-merge.c
index 035e7a604b..df7260857d 100644
--- a/grp/grp-merge.c
+++ b/grp/grp-merge.c
@@ -36,7 +36,6 @@
   })
 
 int
-internal_function
 __copy_grp (const struct group srcgrp, const size_t buflen,
 	    struct group *destgrp, char *destbuf, char **endptr)
 {
@@ -117,7 +116,6 @@ libc_hidden_def (__copy_grp)
 /* Check that the name, GID and passwd fields match, then
    copy in the gr_mem array.  */
 int
-internal_function
 __merge_grp (struct group *savedgrp, char *savedbuf, char *savedend,
 	     size_t buflen, struct group *mergegrp, char *mergebuf)
 {
diff --git a/grp/grp-merge.h b/grp/grp-merge.h
index 1ad9b9a539..f6ee83885b 100644
--- a/grp/grp-merge.h
+++ b/grp/grp-merge.h
@@ -25,13 +25,11 @@
    calling function must free(newbuf).  */
 int
 __copy_grp (const struct group srcgrp, const size_t buflen,
-	    struct group *destgrp, char *destbuf, char **endptr)
-	    internal_function;
+	    struct group *destgrp, char *destbuf, char **endptr);
 
 /* Merge the member lists of two grp structs together.  */
 int
 __merge_grp (struct group *savedgrp, char *savedbuf, char *savedend,
-	     size_t buflen, struct group *mergegrp, char *mergebuf)
-	     internal_function;
+	     size_t buflen, struct group *mergegrp, char *mergebuf);
 
 #endif /* _GRP_MERGE_H */