63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
|
From 77db8772bd3f6f2bbad697dcf46861ce310f5b95 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Thu, 10 Aug 2017 16:06:52 +0200
|
||
|
|
Subject: [PATCH 14] __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)
|
||
|
|
---
|
||
|
|
ChangeLog | 7 +++++++
|
||
|
|
inet/inet6_scopeid_pton.c | 2 +-
|
||
|
|
inet/net-internal.h | 3 +--
|
||
|
|
3 files changed, 9 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ChangeLog b/ChangeLog
|
||
|
|
index 8bc3ad9a46..ad05da8ade 100644
|
||
|
|
--- 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 e09b1cb34d..cc8803fa10 100644
|
||
|
|
--- 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 2b2632c7ba..b2135893e8 100644
|
||
|
|
--- 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)
|
||
|
|
|
||
|
|
|
||
|
|
|