diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-11-25 20:50:16 -0500 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-12-01 15:41:27 +0100 |
| commit | 1489c92cf2192242fc7390ef020acde8922b384d (patch) | |
| tree | 72b04fe2d9015c0061b9a323b84312b68159a39a | |
| parent | c86e42c53fc42195d2ed5926dbc4c8ce25bfa8fd (diff) | |
| download | glibc-1489c92cf2192242fc7390ef020acde8922b384d.tar.gz glibc-1489c92cf2192242fc7390ef020acde8922b384d.tar.xz glibc-1489c92cf2192242fc7390ef020acde8922b384d.zip | |
Don't ignore zero TTL in DNS answers
(cherry picked from commit a769081960837719ea79c2b6f1c962318f23865c)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | resolv/nss_dns/dns-host.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 2744ca6631..7635848628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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-05-31 Petr Baudis <pasky@suse.cz> [BZ #11149] diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index 8592183f62..fe4ac2d793 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -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; |