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 5712443e35092a48bce10aa12307398bf1370056..448d42e53ffc0727d13974053c69b1c10c71ddfc 100644 (file)
--- 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 5cee78844bae54cb097743f352481bf47603c2d2..58e407b9624d0d33f97fbfd8c391b87abb4323af 100644 (file)
--- 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 19dfc2838bc1209a7bd6be57c04f09daf837872c..5b636bdb6d39c903115d286b7592b80ac160ac2a 100644 (file)
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 b4a7f11ee739c27153bccf69407bf0348bf751a5..a9cb944ad083f0cb9b5723ff5cba309abee4804f 100644 (file)
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 316667d778176b0aa50881768c36b2afa60f6f66..32cb2c8948d2c533a2a9c83a734e05d8448c8c42 100644 (file)
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 55083daa38d8fcdc57547d73a0ce3850ede09640..e2c8141e2acb6556789c3db101aca11948565c66 100644 (file)
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 0ff6bedb7170d81ab93ed02cdffe6232dc3f0bdf..d01b6410c5a967745b01cc2c46e7b4c165cf4bb9 100644 (file)
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 372d25556fc87fd48073220d39137b947dd76065..91275e703b64b72b9d727838ab9a6b4c66a6fbfa 100644 (file)
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 a12aaf90625123418d244f44f48443f58620b085..05bda57ed53073bdfbde0e06e3147930402cbece 100644 (file)
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 953ea18d766e2e45d732ee693df9e4e65358fe85..184a55e7361d66641d9e11c9f692320eba73121c 100644 (file)
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 91f2977b35df9d03f2d0a477d91897761f13950b..fa39908960baf86c762b93e7243e5ba8f995c0e4 100644 (file)
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 b25b94e4d91070b84139cfdf1cbe14c9669d35b4..9c0ea0340ad5140f0ac9576ab8802e24ea8c94be 100644 (file)
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 09c84617a873931b7a7dfa57dde723d2a450fc1f..9bdecea994b15b56d0283036ac98091e49a6ee74 100644 (file)
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 b85d291b1593c1f6c826740bc6125eae46518922..64c3d5721381b6ece6d821cea3c7c84647664e88 100644 (file)
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 d478e5a97db90a294b995e3443040a62f46509db..aa9c1a58600cf2a1cc4f4cb76abfbb373bd2d857 100644 (file)
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 4dde7181d6a4c426ce954e56bea8152009581dad..e26833f8b0cd5098cd6fd4a19a1081a36cbfa059 100644 (file)
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 353e0550a5138eac77fb51e3cf22bae41d4a9e45..46bf68c01fc8a5439ec1c5ce5d58b6967b3a6c06 100644 (file)
--- 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 */