qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't ignore zero TTL in DNS answers

This commit is contained in:
Andreas Schwab 2010-11-25 20:50:16 -05:00 committed by Ulrich Drepper
parent 3bf8d1b10c
commit a769081960
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-11-24 Andreas Schwab <schwab@redhat.com>
* resolv/nss_dns/dns-host.c (getanswer_r): Don't handle ttl == 0
specially.
(gaih_getanswer_slice): Likewise.
2010-10-20 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ieee754/ldbl-128/s_fmal.c (__fmal): Fix up inline asm.

7
resolv/nss_dns/dns-host.c
View File

@ -599,7 +599,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
int (*name_ok) (const char *);
u_char packtmp[NS_MAXCDNAME];
int have_to_map = 0;
int32_t ttl = 0;
uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);
buffer += pad;
if (__builtin_expect (buflen < sizeof (struct host_data) + pad, 0))
@ -733,7 +732,7 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
cp += INT16SZ; /* type */
class = __ns_get16 (cp);
cp += INT16SZ; /* class */
ttl = __ns_get32 (cp);
int32_t ttl = __ns_get32 (cp);
cp += INT32SZ; /* TTL */
n = __ns_get16 (cp);
cp += INT16SZ; /* len */
@ -907,7 +906,7 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
{
register int nn;
if (ttlp != NULL && ttl != 0)
if (ttlp != NULL)
*ttlp = ttl;
if (canonp != NULL)
*canonp = bp;
@ -1163,7 +1162,7 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
if (*firstp)
{
if (ttl != 0 && ttlp != NULL)
if (ttlp != NULL)
*ttlp = ttl;
(*pat)->name = canon ?: h_name;