summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--localedata/tst-strptime.c4
-rw-r--r--resolv/res_debug.c1
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ff145cd0a..a2a0cc3949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-26 Ulrich Drepper <drepper@redhat.com>
+
+ * resolv/res_debig.c (__p_type_syms): Add ns_t_dname entry.
+ Patch by Peter Jones <pjones@redhat.com>.
+
2008-06-25 Ulrich Drepper <drepper@redhat.com>
[BZ #6654]
diff --git a/localedata/tst-strptime.c b/localedata/tst-strptime.c
index a95b2c2611..2d4bb7ce09 100644
--- a/localedata/tst-strptime.c
+++ b/localedata/tst-strptime.c
@@ -34,8 +34,8 @@ do_test (void)
printf ("\
r = %p, r-s2 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n",
r, r - s2, tm.tm_mday, tm.tm_mon, tm.tm_year);
- result = (r == NULL || r - s2 != 14 || tm.tm_mday != 25 || tm.tm_mon != 5
- || tm.tm_year != 108);
+ result |= (r == NULL || r - s2 != 14 || tm.tm_mday != 25 || tm.tm_mon != 5
+ || tm.tm_year != 108);
return result;
}
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index cd69d4f4d4..76fd34bf3c 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -439,6 +439,7 @@ const struct res_sym __p_type_syms[] = {
{ns_t_nimloc, "NIMLOC", "NIMROD locator (unimplemented)"},
{ns_t_srv, "SRV", "server selection"},
{ns_t_atma, "ATMA", "ATM address (unimplemented)"},
+ {ns_t_dname, "DNAME", "Non-terminal DNAME (for IPv6)"},
{ns_t_tsig, "TSIG", "transaction signature"},
{ns_t_ixfr, "IXFR", "incremental zone transfer"},
{ns_t_axfr, "AXFR", "zone transfer"},