about summary refs log tree commit diff
path: root/resolv
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-04-04 14:13:03 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-04-04 20:56:23 +0200
commit75b3a15e077dbfdfd8cbb3449369379e700b9972 (patch)
tree35dfc0e3c5be9ba615d67b628cbc8d088d7de21e /resolv
parent07d6f1a3ca990e0e4f93b010605d4d87a3abdf24 (diff)
downloadglibc-75b3a15e077dbfdfd8cbb3449369379e700b9972.tar.gz
glibc-75b3a15e077dbfdfd8cbb3449369379e700b9972.tar.xz
glibc-75b3a15e077dbfdfd8cbb3449369379e700b9972.zip
nss_dns: Remove superfluous dn_expand call from network handling
Diffstat (limited to 'resolv')
-rw-r--r--resolv/nss_dns/dns-network.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 45f7f18057..fd8c5656c0 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -324,11 +324,8 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
 
   while (--answer_count >= 0 && cp < end_of_message)
     {
-      int n = dn_expand (answer->buf, end_of_message, cp, bp, linebuflen);
-      int type, class;
-
-      n = __ns_name_unpack (answer->buf, end_of_message, cp,
-			    packtmp, sizeof packtmp);
+      int n = __ns_name_unpack (answer->buf, end_of_message, cp,
+				packtmp, sizeof packtmp);
       if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
 	{
 	  if (errno == EMSGSIZE)
@@ -350,6 +347,7 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
 	  return NSS_STATUS_UNAVAIL;
 	}
 
+      int type, class;
       GETSHORT (type, cp);
       GETSHORT (class, cp);
       cp += INT32SZ;		/* TTL */