From: Wouter Wijngaards Date: Mon, 19 Nov 2007 09:15:07 +0000 (+0000) Subject: port from trunk. X-Git-Tag: release-0.7.1~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=127de50bc32ff5cf88154f03d772132ff1917d20;p=thirdparty%2Funbound.git port from trunk. git-svn-id: file:///svn/unbound/branches/beta-0.7@756 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/configure.ac b/configure.ac index 5712443e3..448d42e53 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(unbound, 0.7, unbound-bugs@nlnetlabs.nl, unbound) +AC_INIT(unbound, 0.71, unbound-bugs@nlnetlabs.nl, unbound) CFLAGS= AC_AIX diff --git a/doc/Changelog b/doc/Changelog index 5cee78844..58e407b96 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,9 @@ +19 November 2007: Wouter + - version 0.71: + * includes tpkg fixes to kill daemons at end of test + * includes NSEC/RRSIG not downcasing fixup from + dnssec-bis-updates draft-06. + 15 November 2007: Wouter - review fixups from Jelte. diff --git a/testdata/00-lint.tpkg b/testdata/00-lint.tpkg index 19dfc2838..5b636bdb6 100644 Binary files a/testdata/00-lint.tpkg and b/testdata/00-lint.tpkg differ diff --git a/testdata/01-doc.tpkg b/testdata/01-doc.tpkg index b4a7f11ee..a9cb944ad 100644 Binary files a/testdata/01-doc.tpkg and b/testdata/01-doc.tpkg differ diff --git a/testdata/02-unittest.tpkg b/testdata/02-unittest.tpkg index 316667d77..32cb2c894 100644 Binary files a/testdata/02-unittest.tpkg and b/testdata/02-unittest.tpkg differ diff --git a/testdata/03-testbound.tpkg b/testdata/03-testbound.tpkg index 55083daa3..e2c8141e2 100644 Binary files a/testdata/03-testbound.tpkg and b/testdata/03-testbound.tpkg differ diff --git a/testdata/04-checkconf.tpkg b/testdata/04-checkconf.tpkg index 0ff6bedb7..d01b6410c 100644 Binary files a/testdata/04-checkconf.tpkg and b/testdata/04-checkconf.tpkg differ diff --git a/testdata/fwd_compress_c00c.tpkg b/testdata/fwd_compress_c00c.tpkg index 372d25556..91275e703 100644 Binary files a/testdata/fwd_compress_c00c.tpkg and b/testdata/fwd_compress_c00c.tpkg differ diff --git a/testdata/fwd_no_edns.tpkg b/testdata/fwd_no_edns.tpkg index a12aaf906..05bda57ed 100644 Binary files a/testdata/fwd_no_edns.tpkg and b/testdata/fwd_no_edns.tpkg differ diff --git a/testdata/fwd_tcp.tpkg b/testdata/fwd_tcp.tpkg index 953ea18d7..184a55e73 100644 Binary files a/testdata/fwd_tcp.tpkg and b/testdata/fwd_tcp.tpkg differ diff --git a/testdata/fwd_tcp_tc.tpkg b/testdata/fwd_tcp_tc.tpkg index 91f2977b3..fa3990896 100644 Binary files a/testdata/fwd_tcp_tc.tpkg and b/testdata/fwd_tcp_tc.tpkg differ diff --git a/testdata/fwd_tcp_tc6.tpkg b/testdata/fwd_tcp_tc6.tpkg index b25b94e4d..9c0ea0340 100644 Binary files a/testdata/fwd_tcp_tc6.tpkg and b/testdata/fwd_tcp_tc6.tpkg differ diff --git a/testdata/fwd_three.tpkg b/testdata/fwd_three.tpkg index 09c84617a..9bdecea99 100644 Binary files a/testdata/fwd_three.tpkg and b/testdata/fwd_three.tpkg differ diff --git a/testdata/fwd_three_service.tpkg b/testdata/fwd_three_service.tpkg index b85d291b1..64c3d5721 100644 Binary files a/testdata/fwd_three_service.tpkg and b/testdata/fwd_three_service.tpkg differ diff --git a/testdata/fwd_ttlexpire.tpkg b/testdata/fwd_ttlexpire.tpkg index d478e5a97..aa9c1a586 100644 Binary files a/testdata/fwd_ttlexpire.tpkg and b/testdata/fwd_ttlexpire.tpkg differ diff --git a/testdata/fwd_udp.tpkg b/testdata/fwd_udp.tpkg index 4dde7181d..e26833f8b 100644 Binary files a/testdata/fwd_udp.tpkg and b/testdata/fwd_udp.tpkg differ diff --git a/validator/val_sigcrypt.c b/validator/val_sigcrypt.c index 353e0550a..46bf68c01 100644 --- a/validator/val_sigcrypt.c +++ b/validator/val_sigcrypt.c @@ -748,7 +748,6 @@ canonical_compare(struct ub_packed_rrset_key* rrset, size_t i, size_t j) */ /* type starts with the name; remainder is binary compared */ case LDNS_RR_TYPE_NXT: - case LDNS_RR_TYPE_NSEC: /* use rdata field formats */ case LDNS_RR_TYPE_MINFO: case LDNS_RR_TYPE_RP: @@ -758,7 +757,6 @@ canonical_compare(struct ub_packed_rrset_key* rrset, size_t i, size_t j) case LDNS_RR_TYPE_KX: case LDNS_RR_TYPE_MX: case LDNS_RR_TYPE_SIG: - case LDNS_RR_TYPE_RRSIG: case LDNS_RR_TYPE_PX: case LDNS_RR_TYPE_NAPTR: case LDNS_RR_TYPE_SRV: @@ -773,6 +771,8 @@ canonical_compare(struct ub_packed_rrset_key* rrset, size_t i, size_t j) case LDNS_RR_TYPE_HINFO: return canonical_compare_hinfo(d, i, j); + case LDNS_RR_TYPE_NSEC: + case LDNS_RR_TYPE_RRSIG: default: /* For unknown RR types, or types not listed above, * no canonicalization is needed, do binary compare */