diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-10-07 13:43:48 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-10-07 17:41:59 +0200 |
| commit | 5140d036f9c16585448b5908c3a219bd96842161 (patch) | |
| tree | 894bc82b03f1dd56aabcf7bc93d4722b57b14171 /resolv/nss_dns | |
| parent | 7ec47a85d865e7bc43358633a0f960921dbfc373 (diff) | |
| download | glibc-5140d036f9c16585448b5908c3a219bd96842161.tar.gz glibc-5140d036f9c16585448b5908c3a219bd96842161.tar.xz glibc-5140d036f9c16585448b5908c3a219bd96842161.zip | |
resolv: Remove RES_USEBSTRING and its implementation [BZ #20629]
In ns_name_ntop, the NS_CMPRSFLGS check is no longer needed because labellen (called earlier) already rejects everything which is not a plain label (compression references and extended label types).
Diffstat (limited to 'resolv/nss_dns')
| -rw-r--r-- | resolv/nss_dns/dns-host.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index b6245adb5f..c1333b816b 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -464,19 +464,6 @@ _nss_dns_gethostbyaddr2_r (const void *addr, socklen_t len, int af, (uaddr[2] & 0xff), (uaddr[1] & 0xff), (uaddr[0] & 0xff)); break; case AF_INET6: - /* Only lookup with the byte string format if the user wants it. */ - if (__glibc_unlikely (_res.options & RES_USEBSTRING)) - { - qp = stpcpy (qbuf, "\\[x"); - for (n = 0; n < IN6ADDRSZ; ++n) - qp += sprintf (qp, "%02hhx", uaddr[n]); - strcpy (qp, "].ip6.arpa"); - n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, - host_buffer.buf->buf, 1024, &host_buffer.ptr, - NULL, NULL, NULL, NULL); - if (n >= 0) - goto got_it_already; - } qp = qbuf; for (n = IN6ADDRSZ - 1; n >= 0; n--) { @@ -504,7 +491,6 @@ _nss_dns_gethostbyaddr2_r (const void *addr, socklen_t len, int af, return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND; } - got_it_already: status = getanswer_r (host_buffer.buf, n, qbuf, T_PTR, result, buffer, buflen, errnop, h_errnop, 0 /* XXX */, ttlp, NULL); if (host_buffer.buf != orig_host_buffer) |