|
 |
8597553 |
commit 75b3a15e077dbfdfd8cbb3449369379e700b9972
|
|
|
8597553 |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
8597553 |
Date: Tue Apr 4 14:13:03 2017 +0200
|
|
|
8597553 |
|
|
|
8597553 |
nss_dns: Remove superfluous dn_expand call from network handling
|
|
|
8597553 |
|
|
|
8597553 |
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
|
|
|
8597553 |
index 45f7f1805701e0a4..fd8c5656c0cedd27 100644
|
|
|
8597553 |
--- a/resolv/nss_dns/dns-network.c
|
|
|
8597553 |
+++ b/resolv/nss_dns/dns-network.c
|
|
|
8597553 |
@@ -324,11 +324,8 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
|
|
|
8597553 |
|
|
|
8597553 |
while (--answer_count >= 0 && cp < end_of_message)
|
|
|
8597553 |
{
|
|
|
8597553 |
- int n = dn_expand (answer->buf, end_of_message, cp, bp, linebuflen);
|
|
|
8597553 |
- int type, class;
|
|
|
8597553 |
-
|
|
|
8597553 |
- n = __ns_name_unpack (answer->buf, end_of_message, cp,
|
|
|
8597553 |
- packtmp, sizeof packtmp);
|
|
|
8597553 |
+ int n = __ns_name_unpack (answer->buf, end_of_message, cp,
|
|
|
8597553 |
+ packtmp, sizeof packtmp);
|
|
|
8597553 |
if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
|
|
|
8597553 |
{
|
|
|
8597553 |
if (errno == EMSGSIZE)
|
|
|
8597553 |
@@ -350,6 +347,7 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
|
|
|
8597553 |
return NSS_STATUS_UNAVAIL;
|
|
|
8597553 |
}
|
|
|
8597553 |
|
|
|
8597553 |
+ int type, class;
|
|
|
8597553 |
GETSHORT (type, cp);
|
|
|
8597553 |
GETSHORT (class, cp);
|
|
|
8597553 |
cp += INT32SZ; /* TTL */
|