__inet6_scopeid_pton: Remove attribute_hidden, internal_function

The hidden attribute was overridden by libc_hidden_proto on GNU/Linux.
It is incorrect because the function is used from nscd.

internal_function is not supposed to be used across DSO boundaries,
so this commit removes it (again, due to the use in nscd).

(cherry picked from commit f87cc2bfba9b844da48a63441c6099342b1551c7)

diff --git a/ChangeLog b/ChangeLog
index 8bc3ad9a463cfc1d6f919614dd6cf4873e005cfa..ad05da8ade910cfd258bd471a534206bf7c77bc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-10  Florian Weimer  <fweimer@redhat.com>
+
+       * inet/net-internal.h (__inet6_scopeid_pton): Remove
+       attribute_hidden, internal_function.
+       * inet/inet6_scopeid_pton.c (__inet6_scopeid_pton): Remove
+       internal_function.
+
 2017-08-21  Florian Weimer  <fweimer@redhat.com>
 
        [BZ #21972]

diff --git a/inet/inet6_scopeid_pton.c b/inet/inet6_scopeid_pton.c
index e09b1cb34dcc9424cf091d32b0811108fe34d2d9..cc8803fa108f7bcb834606efbfbdfdeda84625d9 100644 (file)
--- a/inet/inet6_scopeid_pton.c
+++ b/inet/inet6_scopeid_pton.c
@@ -28,7 +28,7 @@
 
 /* Parse SOURCE as a scope ID for ADDRESS.  Return 0 on success and -1
    on error.  */
-internal_function int
+int
 __inet6_scopeid_pton (const struct in6_addr *address, const char *scope,
                       uint32_t *result)
 {

diff --git a/inet/net-internal.h b/inet/net-internal.h
index 2b2632c7ba845c7b3ea6d735f7e7451728f5c5b2..b2135893e8a3fccbd0a6e0df809ee56a5401ecc4 100644 (file)
--- a/inet/net-internal.h
+++ b/inet/net-internal.h
@@ -25,8 +25,7 @@
 #include <sys/time.h>
 
 int __inet6_scopeid_pton (const struct in6_addr *address,
-                          const char *scope, uint32_t *result)
-  internal_function attribute_hidden;
+                          const char *scope, uint32_t *result);
 libc_hidden_proto (__inet6_scopeid_pton)