aboutsummaryrefslogtreecommitdiff
path: root/resolv
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-02-04 15:47:59 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-02-04 15:47:59 +0100
commit4e9ff104f2071c096a4f91cb64c0c96e8a18b791 (patch)
treeb8df7235a6b3150ec85b2162e4fe159da008fa07 /resolv
parent525478a25143fa1d040fd857600415fb2e4c0fe1 (diff)
downloadglibc-4e9ff104f2071c096a4f91cb64c0c96e8a18b791.tar
glibc-4e9ff104f2071c096a4f91cb64c0c96e8a18b791.tar.gz
glibc-4e9ff104f2071c096a4f91cb64c0c96e8a18b791.tar.bz2
glibc-4e9ff104f2071c096a4f91cb64c0c96e8a18b791.zip
Restore GLIBC_PRIVATE ABI after CVE-2016-10739 fix [BZ #20018]fw/bug20018-backport
This commit avoids adding the __inet_aton_exact@GLIBC_PRIVATE symbol. In master, the separately-compiled getaddrinfo implementation in nscd needs it, however such an internal ABI change is not desirable on a release branch if it can be avoided easily.
Diffstat (limited to 'resolv')
-rw-r--r--resolv/Versions1
-rw-r--r--resolv/inet_addr.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/resolv/Versions b/resolv/Versions
index 9a82704af7..b05778d965 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -27,7 +27,6 @@ libc {
__h_errno; __resp;
__res_iclose;
- __inet_aton_exact;
__inet_pton_length;
__resolv_context_get;
__resolv_context_get_preinit;
diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c
index 41b6166a5b..1bc4a2c4d6 100644
--- a/resolv/inet_addr.c
+++ b/resolv/inet_addr.c
@@ -192,7 +192,6 @@ __inet_aton_exact (const char *cp, struct in_addr *addr)
else
return 0;
}
-libc_hidden_def (__inet_aton_exact)
/* inet_aton ignores trailing garbage. */
int