nss_dns: Remove superfluous dn_expand call from network handling
This commit is contained in:
parent
07d6f1a3ca
commit
75b3a15e07
|
@ -1,3 +1,8 @@
|
||||||
|
2017-04-04 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
|
* resolv/nss_dns/dns-network.c (getanswer_r): Remove __dn_expand
|
||||||
|
call whose result is not used.
|
||||||
|
|
||||||
2017-04-04 Florian Weimer <fweimer@redhat.com>
|
2017-04-04 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
* resolv/tst-ns_name.c, resolv/tst-ns_name.data: New file.
|
* resolv/tst-ns_name.c, resolv/tst-ns_name.data: New file.
|
||||||
|
|
|
@ -324,10 +324,7 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
|
||||||
|
|
||||||
while (--answer_count >= 0 && cp < end_of_message)
|
while (--answer_count >= 0 && cp < end_of_message)
|
||||||
{
|
{
|
||||||
int n = dn_expand (answer->buf, end_of_message, cp, bp, linebuflen);
|
int n = __ns_name_unpack (answer->buf, end_of_message, cp,
|
||||||
int type, class;
|
|
||||||
|
|
||||||
n = __ns_name_unpack (answer->buf, end_of_message, cp,
|
|
||||||
packtmp, sizeof packtmp);
|
packtmp, sizeof packtmp);
|
||||||
if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
|
if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
|
||||||
{
|
{
|
||||||
|
@ -350,6 +347,7 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
|
||||||
return NSS_STATUS_UNAVAIL;
|
return NSS_STATUS_UNAVAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int type, class;
|
||||||
GETSHORT (type, cp);
|
GETSHORT (type, cp);
|
||||||
GETSHORT (class, cp);
|
GETSHORT (class, cp);
|
||||||
cp += INT32SZ; /* TTL */
|
cp += INT32SZ; /* TTL */
|
||||||
|
|
Loading…
Reference in New Issue