diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-02-04 15:47:59 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-02-04 15:47:59 +0100 |
| commit | 4e9ff104f2071c096a4f91cb64c0c96e8a18b791 (patch) | |
| tree | b8df7235a6b3150ec85b2162e4fe159da008fa07 /nscd | |
| parent | 525478a25143fa1d040fd857600415fb2e4c0fe1 (diff) | |
| download | glibc-fw/bug20018-backport.tar.xz glibc-fw/bug20018-backport.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 'nscd')
| -rw-r--r-- | nscd/Makefile | 2 | ||||
| -rw-r--r-- | nscd/nscd-inet_addr.c | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index b713a84c49..eb23c01a39 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -36,7 +36,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \ getsrvbynm_r getsrvbypt_r servicescache \ dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \ xmalloc xstrdup aicache initgrcache gai res_hconf \ - netgroupcache + netgroupcache nscd-inet_addr ifeq ($(build-nscd)$(have-thread-library),yesyes) diff --git a/nscd/nscd-inet_addr.c b/nscd/nscd-inet_addr.c new file mode 100644 index 0000000000..cfa4ac7462 --- /dev/null +++ b/nscd/nscd-inet_addr.c @@ -0,0 +1,24 @@ +/* Legacy IPv4 text-to-address functions. Version for nscd. + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +/* Do not provide definitions of the public symbols exported from + libc. */ +#undef weak_alias +#define weak_alias(from, to) + +#include <resolv/inet_addr.c> |