From 640bbdf71c6f10ac26252ac67a22902e26657bd8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Move dn_expand to its own file and into libc And reformat to GNU style. This switches back to the dn_expand name for the ABI symbol and turns __dn_expand into a compatibility symbol. With the improved namespace management in current glibc, it is no longer necessary to use a private namespace symbol. To avoid old code binding to a GLIBC_PRIVATE symbol by accident, use __libc_dn_expand for the internal symbol name. The symbols dn_expand, __dnexpand were moved using scripts/move-symbol-to-libc.py, followed by an adjustment to make dn_expand the only GLIBC_2.34 symbol. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- resolv/nss_dns/dns-canon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resolv/nss_dns') diff --git a/resolv/nss_dns/dns-canon.c b/resolv/nss_dns/dns-canon.c index 1cdc9a8..b7340d7 100644 --- a/resolv/nss_dns/dns-canon.c +++ b/resolv/nss_dns/dns-canon.c @@ -125,8 +125,8 @@ _nss_dns_getcanonname_r (const char *name, char *buffer, size_t buflen, if (type == qtypes[i]) { /* We found the record. */ - s = __dn_expand (ansp.buf->buf, endptr, namestart, - buffer, buflen); + s = __libc_dn_expand (ansp.buf->buf, endptr, namestart, + buffer, buflen); if (s < 0) { if (errno != EMSGSIZE) -- cgit v1.1