This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.12-223-ga769081
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 Nov 2010 01:50:38 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.12-223-ga769081
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a769081960837719ea79c2b6f1c962318f23865c (commit)
from 3bf8d1b10c66bfd58d8f24ea9e31d9fc0d24553b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a769081960837719ea79c2b6f1c962318f23865c
commit a769081960837719ea79c2b6f1c962318f23865c
Author: Andreas Schwab <schwab@redhat.com>
Date: Thu Nov 25 20:50:16 2010 -0500
Don't ignore zero TTL in DNS answers
diff --git a/ChangeLog b/ChangeLog
index b189baa..c253bf1 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-10-20 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ieee754/ldbl-128/s_fmal.c (__fmal): Fix up inline asm.
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 8592183..fe4ac2d 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;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
resolv/nss_dns/dns-host.c | 7 +++----
2 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources