From 28ef07b698477088a67403137f406b0b40de60c517fc9b564ce11bb75683bc48 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 5 Aug 2013 14:51:21 +0000 Subject: [PATCH] - Update to 9.9.3P2 fixes CVE-2013-4854, bnc#831899. * Incorrect bounds checking on private type 'keydata' can lead to a remotely triggerable REQUIRE failure. OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=125 --- bind-9.9.3-P1.tar.gz | 3 - bind-9.9.3-P1.tar.gz.asc | 11 - bind-9.9.3-P2.tar.gz | 3 + bind-9.9.3-P2.tar.gz.asc | 11 + bind.changes | 7 + bind.spec | 8 +- pid-path.diff | 10 +- pie_compile.diff | 54 ++-- rpz2+rl-9.9.3-P1.patch | 570 ++++++++++++++++++++++----------------- 9 files changed, 381 insertions(+), 296 deletions(-) delete mode 100644 bind-9.9.3-P1.tar.gz delete mode 100644 bind-9.9.3-P1.tar.gz.asc create mode 100644 bind-9.9.3-P2.tar.gz create mode 100644 bind-9.9.3-P2.tar.gz.asc diff --git a/bind-9.9.3-P1.tar.gz b/bind-9.9.3-P1.tar.gz deleted file mode 100644 index 3808db5..0000000 --- a/bind-9.9.3-P1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1baa22e47c3b307c5fcc7aaf6700dd5953b5b9b7737d1e36117545af7bdbb435 -size 7459819 diff --git a/bind-9.9.3-P1.tar.gz.asc b/bind-9.9.3-P1.tar.gz.asc deleted file mode 100644 index d435837..0000000 --- a/bind-9.9.3-P1.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (NetBSD) - -iQEcBAABAgAGBQJRrkT/AAoJEEWseFcYnNvF10kH/2hDHZitnJyuJNbmdgxn76vt -2LLzT+OQwMaq1owbyQHrY3jsKWNgGpB0toRApAyC6y0AJUgNjpNS7xvZcMaZXqam -YQAyib+tGthCtIGOAQxYQae/lhuykip87Xi31jGwZzRnCSwUOHoPJ3iWk8XbM34c -lKzAvsOimnpU8MxAyFPTO792A4INffiuH0UtnmBjSPACguO3/Nx+EJFxgtq7nx+e -NXMKENI0UYxTuwL8MfMnweB69gTQyJOuYUznRfm+CeX3BdhslLzDvWlaVSngaXbP -YTFxLaH/QuXHri1anKWMP8++rWhsNn1n0DvOmiu8DpOslZ4+UmHXyTpGXB3JwYw= -=eKF8 ------END PGP SIGNATURE----- diff --git a/bind-9.9.3-P2.tar.gz b/bind-9.9.3-P2.tar.gz new file mode 100644 index 0000000..980de4c --- /dev/null +++ b/bind-9.9.3-P2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e8ab06c7b73f38b47ce9ad12ca0afa7c714bbba2f6b7421c26c0d8b84b6c678 +size 7459422 diff --git a/bind-9.9.3-P2.tar.gz.asc b/bind-9.9.3-P2.tar.gz.asc new file mode 100644 index 0000000..6110bfc --- /dev/null +++ b/bind-9.9.3-P2.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (NetBSD) + +iQEcBAABAgAGBQJR8sogAAoJEEWseFcYnNvFyMUIAJ3AfF7bF4rUajtXA5cj8HoE +8pQsCvf1nYUoFQv1AwovA6PNc+EpQVtPkpQlItaIdacyN1ewjsoPEMcWdA8Xk0z1 +T0CpJIZfAlGl1QZBAqGnxt4KH4kHAuhQiT9S1boIPOdlHJ84NRD94et+hQfdqWIX +dG4vyChOAYlNFwfQd97JyxWjplRT0YbaWQ8YoWh3puH33jC6yX0v8VfY0g0ga7Ul +hz3PIiZo51JkVcWtsy5qf1WAVSqthzy6KB9MsXJZR7i+2H6t/1/7FK/niBPdASQB +czR7gLmjuk/G5dJ1ZkEosJVEILjfLn9rTLKwf2d8dkgJwrZDpMyNMTqSUJgsRHQ= +=Y9CU +-----END PGP SIGNATURE----- diff --git a/bind.changes b/bind.changes index 25113ce..9626e01 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 5 14:50:20 UTC 2013 - max@suse.com + +- Update to 9.9.3P2 fixes CVE-2013-4854, bnc#831899. + * Incorrect bounds checking on private type 'keydata' can lead + to a remotely triggerable REQUIRE failure. + ------------------------------------------------------------------- Wed Jul 24 15:37:09 UTC 2013 - max@suse.com diff --git a/bind.spec b/bind.spec index 52830f9..076574c 100644 --- a/bind.spec +++ b/bind.spec @@ -18,7 +18,7 @@ Name: bind %define pkg_name bind -%define pkg_vers 9.9.3-P1 +%define pkg_vers 9.9.3-P2 BuildRequires: krb5-devel BuildRequires: libcap BuildRequires: libcap-devel @@ -32,7 +32,7 @@ BuildRequires: update-desktop-files Summary: Domain Name System (DNS) Server (named) License: ISC Group: Productivity/Networking/DNS/Servers -Version: 9.9.3P1 +Version: 9.9.3P2 Release: 0 Provides: bind8 Provides: bind9 @@ -667,6 +667,8 @@ fi %{_bindir}/runidn %{_sbindir}/arpaname %{_sbindir}/ddns-confgen +%{_sbindir}/dnssec-checkds +%{_sbindir}/dnssec-coverage %{_sbindir}/dnssec-dsfromkey %{_sbindir}/dnssec-keyfromlabel %{_sbindir}/dnssec-keygen @@ -692,6 +694,8 @@ fi %doc %{_mandir}/man1/nsupdate.1.gz %doc %{_mandir}/man5/rndc.conf.5.gz %doc %{_mandir}/man8/ddns-confgen.8.gz +%doc %{_mandir}/man8/dnssec-checkds.8.gz +%doc %{_mandir}/man8/dnssec-coverage.8.gz %doc %{_mandir}/man8/dnssec-dsfromkey.8.gz %doc %{_mandir}/man8/dnssec-keyfromlabel.8.gz %doc %{_mandir}/man8/dnssec-keygen.8.gz diff --git a/pid-path.diff b/pid-path.diff index d0a9eef..1009de6 100644 --- a/pid-path.diff +++ b/pid-path.diff @@ -1,8 +1,8 @@ Index: bin/named/include/named/globals.h =================================================================== ---- bin/named/include/named/globals.h.orig -+++ bin/named/include/named/globals.h -@@ -134,9 +134,9 @@ EXTERN const char * lwresd_g_defaultpid +--- bin/named/include/named/globals.h.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/include/named/globals.h 2013-08-05 14:14:28.152275375 +0200 +@@ -139,9 +139,9 @@ "lwresd.pid"); #else EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR @@ -16,8 +16,8 @@ Index: bin/named/include/named/globals.h EXTERN const char * ns_g_username INIT(NULL); Index: contrib/nanny/nanny.pl =================================================================== ---- contrib/nanny/nanny.pl.orig -+++ contrib/nanny/nanny.pl +--- contrib/nanny/nanny.pl.orig 2013-07-17 00:13:06.000000000 +0200 ++++ contrib/nanny/nanny.pl 2013-08-05 14:14:28.153275387 +0200 @@ -19,7 +19,7 @@ # A simple nanny to make sure named stays running. diff --git a/pie_compile.diff b/pie_compile.diff index 0314da2..2c1b5a7 100644 --- a/pie_compile.diff +++ b/pie_compile.diff @@ -1,8 +1,8 @@ Index: bin/Makefile.in =================================================================== ---- bin/Makefile.in.orig -+++ bin/Makefile.in -@@ -23,4 +23,8 @@ SUBDIRS = named rndc dig dnssec tests to +--- bin/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/Makefile.in 2013-08-05 14:14:38.988411490 +0200 +@@ -23,4 +23,8 @@ check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ TARGETS = @@ -13,9 +13,9 @@ Index: bin/Makefile.in +LDFLAGS += -pie Index: bin/dig/Makefile.in =================================================================== ---- bin/dig/Makefile.in.orig -+++ bin/dig/Makefile.in -@@ -67,8 +67,12 @@ HTMLPAGES = dig.html host.html nslookup. +--- bin/dig/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/dig/Makefile.in 2013-08-05 14:14:38.988411490 +0200 +@@ -69,8 +69,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -30,9 +30,9 @@ Index: bin/dig/Makefile.in ${FINALBUILDCMD} Index: bin/dnssec/Makefile.in =================================================================== ---- bin/dnssec/Makefile.in.orig -+++ bin/dnssec/Makefile.in -@@ -64,8 +64,12 @@ HTMLPAGES = dnssec-dsfromkey.html dnssec +--- bin/dnssec/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/dnssec/Makefile.in 2013-08-05 14:14:38.988411490 +0200 +@@ -64,8 +64,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -47,9 +47,9 @@ Index: bin/dnssec/Makefile.in ${FINALBUILDCMD} Index: bin/nsupdate/Makefile.in =================================================================== ---- bin/nsupdate/Makefile.in.orig -+++ bin/nsupdate/Makefile.in -@@ -64,8 +64,12 @@ HTMLPAGES = nsupdate.html +--- bin/nsupdate/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/nsupdate/Makefile.in 2013-08-05 14:14:38.988411490 +0200 +@@ -66,8 +66,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -64,9 +64,9 @@ Index: bin/nsupdate/Makefile.in -DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\" \ Index: bin/rndc/Makefile.in =================================================================== ---- bin/rndc/Makefile.in.orig -+++ bin/rndc/Makefile.in -@@ -59,8 +59,12 @@ HTMLPAGES = rndc.html rndc.conf.html +--- bin/rndc/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/rndc/Makefile.in 2013-08-05 14:14:38.988411490 +0200 +@@ -59,8 +59,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -81,9 +81,9 @@ Index: bin/rndc/Makefile.in -DVERSION=\"${VERSION}\" \ Index: bin/check/Makefile.in =================================================================== ---- bin/check/Makefile.in.orig -+++ bin/check/Makefile.in -@@ -57,8 +57,12 @@ HTMLPAGES = named-checkconf.html named-c +--- bin/check/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/check/Makefile.in 2013-08-05 14:14:38.988411490 +0200 +@@ -57,8 +57,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -98,9 +98,9 @@ Index: bin/check/Makefile.in -DVERSION=\"${VERSION}\" \ Index: bin/named/Makefile.in =================================================================== ---- bin/named/Makefile.in.orig -+++ bin/named/Makefile.in -@@ -109,8 +109,12 @@ HTMLPAGES = named.html lwresd.html named +--- bin/named/Makefile.in.orig 2013-08-05 14:14:27.313264836 +0200 ++++ bin/named/Makefile.in 2013-08-05 14:14:38.988411490 +0200 +@@ -115,8 +115,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -115,9 +115,9 @@ Index: bin/named/Makefile.in -DVERSION=\"${VERSION}\" \ Index: bin/named/unix/Makefile.in =================================================================== ---- bin/named/unix/Makefile.in.orig -+++ bin/named/unix/Makefile.in -@@ -34,4 +34,6 @@ SRCS = os.c dlz_dlopen_driver.c +--- bin/named/unix/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/unix/Makefile.in 2013-08-05 14:14:38.989411502 +0200 +@@ -34,4 +34,6 @@ TARGETS = ${OBJS} @@ -126,9 +126,9 @@ Index: bin/named/unix/Makefile.in @BIND9_MAKE_RULES@ Index: bin/confgen/Makefile.in =================================================================== ---- bin/confgen/Makefile.in.orig -+++ bin/confgen/Makefile.in -@@ -64,8 +64,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} +--- bin/confgen/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/confgen/Makefile.in 2013-08-05 14:14:38.989411502 +0200 +@@ -64,8 +64,12 @@ UOBJS = unix/os.@O@ diff --git a/rpz2+rl-9.9.3-P1.patch b/rpz2+rl-9.9.3-P1.patch index d0c4a66..761ad4b 100644 --- a/rpz2+rl-9.9.3-P1.patch +++ b/rpz2+rl-9.9.3-P1.patch @@ -1,6 +1,7 @@ -diff -r -u bin/named/client.c-orig bin/named/client.c ---- bin/named/client.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/named/client.c 2004-01-01 00:00:00.000000000 +0000 +Index: bin/named/client.c +=================================================================== +--- bin/named/client.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/client.c 2013-08-05 14:14:45.875498002 +0200 @@ -994,6 +994,11 @@ } if (result != ISC_R_SUCCESS) @@ -65,9 +66,10 @@ diff -r -u bin/named/client.c-orig bin/named/client.c * Message may be an in-progress reply that we had trouble * with, in which case QR will be set. We need to clear QR before * calling dns_message_reply() to avoid triggering an assertion. -diff -r -u bin/named/config.c-orig bin/named/config.c ---- bin/named/config.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/named/config.c 2004-01-01 00:00:00.000000000 +0000 +Index: bin/named/config.c +=================================================================== +--- bin/named/config.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/config.c 2013-08-05 14:14:45.875498002 +0200 @@ -228,6 +228,13 @@ notify no;\n\ allow-new-zones no;\n\ @@ -82,9 +84,10 @@ diff -r -u bin/named/config.c-orig bin/named/config.c zone \"version.bind\" chaos {\n\ type master;\n\ database \"_builtin version\";\n\ -diff -r -u bin/named/include/named/query.h-orig bin/named/include/named/query.h ---- bin/named/include/named/query.h-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/named/include/named/query.h 2004-01-01 00:00:00.000000000 +0000 +Index: bin/named/include/named/query.h +=================================================================== +--- bin/named/include/named/query.h.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/include/named/query.h 2013-08-05 14:14:45.875498002 +0200 @@ -85,6 +85,7 @@ #define NS_QUERYATTR_CACHEACLOK 0x2000 #define NS_QUERYATTR_DNS64 0x4000 @@ -93,9 +96,10 @@ diff -r -u bin/named/include/named/query.h-orig bin/named/include/named/query.h isc_result_t -diff -r -u bin/named/include/named/server.h-orig bin/named/include/named/server.h ---- bin/named/include/named/server.h-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/named/include/named/server.h 2004-01-01 00:00:00.000000000 +0000 +Index: bin/named/include/named/server.h +=================================================================== +--- bin/named/include/named/server.h.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/include/named/server.h 2013-08-05 14:14:45.875498002 +0200 @@ -167,7 +167,10 @@ dns_nsstatscounter_rpz_rewrites = 36, @@ -108,9 +112,10 @@ diff -r -u bin/named/include/named/server.h-orig bin/named/include/named/server. }; void -diff -r -u bin/named/query.c-orig bin/named/query.c ---- bin/named/query.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/named/query.c 2004-01-01 00:00:00.000000000 +0000 +Index: bin/named/query.c +=================================================================== +--- bin/named/query.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/query.c 2013-08-05 14:14:45.877498027 +0200 @@ -193,7 +193,7 @@ #ifdef NEWSTATS /* Do query type statistics @@ -1886,9 +1891,10 @@ diff -r -u bin/named/query.c-orig bin/named/query.c */ query_next(client, eresult); } else { -diff -r -u bin/named/server.c-orig bin/named/server.c ---- bin/named/server.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/named/server.c 2004-01-01 00:00:00.000000000 +0000 +Index: bin/named/server.c +=================================================================== +--- bin/named/server.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/server.c 2013-08-05 14:14:45.879498052 +0200 @@ -373,7 +373,8 @@ static isc_result_t configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, @@ -2024,17 +2030,17 @@ diff -r -u bin/named/server.c-orig bin/named/server.c if (result != ISC_R_SUCCESS) return (result); -@@ -1635,10 +1673,282 @@ +@@ -1635,8 +1673,280 @@ return (result); } } + if (*old_rpz_okp && (new->policy != old->policy || + !dns_name_equal(&old->cname, &new->cname))) + *old_rpz_okp = ISC_FALSE; - - return (ISC_R_SUCCESS); - } - ++ ++ return (ISC_R_SUCCESS); ++} ++ +static isc_result_t +configure_rpz(dns_view_t *view, const cfg_obj_t *rpz_obj, + isc_boolean_t *old_rpz_okp) @@ -2296,17 +2302,15 @@ diff -r -u bin/named/server.c-orig bin/named/server.c + rrl->log_only = ISC_TRUE; + else + rrl->log_only = ISC_FALSE; -+ -+ return (ISC_R_SUCCESS); + + return (ISC_R_SUCCESS); + + cleanup: + dns_rrl_view_destroy(view); + return (result); -+} -+ + } + /* - * Configure 'view' according to 'vconfig', taking defaults from 'config' - * where values are missing in 'vconfig'. @@ -1705,7 +2015,7 @@ dns_acl_t *clients = NULL, *mapped = NULL, *excluded = NULL; unsigned int query_timeout, ndisp; @@ -2516,9 +2520,10 @@ diff -r -u bin/named/server.c-orig bin/named/server.c dns_view_freeze(view); isc_task_endexclusive(server->task); if (result != ISC_R_SUCCESS) -diff -r -u bin/named/statschannel.c-orig bin/named/statschannel.c ---- bin/named/statschannel.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/named/statschannel.c 2004-01-01 00:00:00.000000000 +0000 +Index: bin/named/statschannel.c +=================================================================== +--- bin/named/statschannel.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/named/statschannel.c 2013-08-05 14:14:45.879498052 +0200 @@ -206,6 +206,10 @@ SET_NSSTATDESC(updatebadprereq, "updates rejected due to prerequisite failure", @@ -2530,9 +2535,10 @@ diff -r -u bin/named/statschannel.c-orig bin/named/statschannel.c SET_NSSTATDESC(rpz_rewrites, "response policy zone rewrites", "RPZRewrites"); INSIST(i == dns_nsstatscounter_max); -diff -r -u bin/tests/system/README-orig bin/tests/system/README ---- bin/tests/system/README-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/README 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/README +=================================================================== +--- bin/tests/system/README.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/README 2013-08-05 14:14:45.879498052 +0200 @@ -17,6 +17,7 @@ nsupdate/ Dynamic update and IXFR tests resolver/ Regression tests for resolver bugs that have been fixed @@ -2541,9 +2547,10 @@ diff -r -u bin/tests/system/README-orig bin/tests/system/README rpz/ Tests of response policy zone (RPZ) rewriting stub/ Tests of stub zone functionality unknown/ Unknown type and class tests -diff -r -u bin/tests/system/conf.sh.in-orig bin/tests/system/conf.sh.in ---- bin/tests/system/conf.sh.in-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/conf.sh.in 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/conf.sh.in +=================================================================== +--- bin/tests/system/conf.sh.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/conf.sh.in 2013-08-05 14:14:45.879498052 +0200 @@ -62,7 +62,7 @@ database dlv dlvauto dlz dlzexternal dname dns64 dnssec ecdsa formerr forward glue gost ixfr inline limits logfileconfig @@ -2553,9 +2560,10 @@ diff -r -u bin/tests/system/conf.sh.in-orig bin/tests/system/conf.sh.in smartsign sortlist spf staticstub stub tkey tsig tsiggss unknown upforwd verify views wildcard xfer xferquota zonechecks" -diff -r -u bin/tests/system/rpz/Makefile.in-orig bin/tests/system/rpz/Makefile.in ---- bin/tests/system/rpz/Makefile.in-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/Makefile.in 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/Makefile.in +=================================================================== +--- bin/tests/system/rpz/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/Makefile.in 2013-08-05 14:14:45.879498052 +0200 @@ -12,8 +12,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. @@ -2565,9 +2573,10 @@ diff -r -u bin/tests/system/rpz/Makefile.in-orig bin/tests/system/rpz/Makefile.i srcdir = @srcdir@ VPATH = @srcdir@ -diff -r -u bin/tests/system/rpz/clean.sh-orig bin/tests/system/rpz/clean.sh ---- bin/tests/system/rpz/clean.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/clean.sh 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/clean.sh +=================================================================== +--- bin/tests/system/rpz/clean.sh.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/clean.sh 2013-08-05 14:14:45.879498052 +0200 @@ -12,8 +12,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. @@ -2577,9 +2586,10 @@ diff -r -u bin/tests/system/rpz/clean.sh-orig bin/tests/system/rpz/clean.sh # Clean up after rpz tests. -diff -r -u bin/tests/system/rpz/ns1/named.conf-orig bin/tests/system/rpz/ns1/named.conf ---- bin/tests/system/rpz/ns1/named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns1/named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns1/named.conf +=================================================================== +--- bin/tests/system/rpz/ns1/named.conf.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns1/named.conf 2013-08-05 14:14:45.880498065 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2013 Internet Systems Consortium, Inc. ("ISC") @@ -2596,9 +2606,10 @@ diff -r -u bin/tests/system/rpz/ns1/named.conf-orig bin/tests/system/rpz/ns1/nam controls { /* empty */ }; -diff -r -u bin/tests/system/rpz/ns1/root.db-orig bin/tests/system/rpz/ns1/root.db ---- bin/tests/system/rpz/ns1/root.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns1/root.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns1/root.db +=================================================================== +--- bin/tests/system/rpz/ns1/root.db.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns1/root.db 2013-08-05 14:14:45.880498065 +0200 @@ -12,8 +12,6 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. @@ -2608,9 +2619,10 @@ diff -r -u bin/tests/system/rpz/ns1/root.db-orig bin/tests/system/rpz/ns1/root.d $TTL 120 . SOA ns. hostmaster.ns. ( 1 3600 1200 604800 60 ) -diff -r -u bin/tests/system/rpz/ns2/base-tld2s.db-orig bin/tests/system/rpz/ns2/base-tld2s.db ---- bin/tests/system/rpz/ns2/base-tld2s.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns2/base-tld2s.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns2/base-tld2s.db +=================================================================== +--- bin/tests/system/rpz/ns2/base-tld2s.db.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns2/base-tld2s.db 2013-08-05 14:14:45.880498065 +0200 @@ -1,4 +1,4 @@ -; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC") @@ -2626,9 +2638,10 @@ diff -r -u bin/tests/system/rpz/ns2/base-tld2s.db-orig bin/tests/system/rpz/ns2/ ; RPZ rewrite responses from this signed zone -diff -r -u bin/tests/system/rpz/ns2/hints-orig bin/tests/system/rpz/ns2/hints ---- bin/tests/system/rpz/ns2/hints-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns2/hints 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns2/hints +=================================================================== +--- bin/tests/system/rpz/ns2/hints.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns2/hints 2013-08-05 14:14:45.880498065 +0200 @@ -1,4 +1,4 @@ -; Copyright (C) 2011, 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC") @@ -2644,9 +2657,10 @@ diff -r -u bin/tests/system/rpz/ns2/hints-orig bin/tests/system/rpz/ns2/hints . 120 NS ns. ns. 120 A 10.53.0.1 -diff -r -u bin/tests/system/rpz/ns2/named.conf-orig bin/tests/system/rpz/ns2/named.conf ---- bin/tests/system/rpz/ns2/named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns2/named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns2/named.conf +=================================================================== +--- bin/tests/system/rpz/ns2/named.conf.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns2/named.conf 2013-08-05 14:14:45.880498065 +0200 @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ @@ -2656,9 +2670,10 @@ diff -r -u bin/tests/system/rpz/ns2/named.conf-orig bin/tests/system/rpz/ns2/nam controls { /* empty */ }; -diff -r -u bin/tests/system/rpz/ns2/tld2.db-orig bin/tests/system/rpz/ns2/tld2.db ---- bin/tests/system/rpz/ns2/tld2.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns2/tld2.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns2/tld2.db +=================================================================== +--- bin/tests/system/rpz/ns2/tld2.db.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns2/tld2.db 2013-08-05 14:14:45.880498065 +0200 @@ -12,8 +12,6 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. @@ -2678,9 +2693,10 @@ diff -r -u bin/tests/system/rpz/ns2/tld2.db-orig bin/tests/system/rpz/ns2/tld2.d a5-3 A 192.168.5.3 TXT "a5-3 tld2 text" -diff -r -u bin/tests/system/rpz/ns3/base.db-orig bin/tests/system/rpz/ns3/base.db ---- bin/tests/system/rpz/ns3/base.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns3/base.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns3/base.db +=================================================================== +--- bin/tests/system/rpz/ns3/base.db.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns3/base.db 2013-08-05 14:14:45.880498065 +0200 @@ -12,8 +12,6 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. @@ -2690,9 +2706,10 @@ diff -r -u bin/tests/system/rpz/ns3/base.db-orig bin/tests/system/rpz/ns3/base.d ; RPZ test -diff -r -u bin/tests/system/rpz/ns3/hints-orig bin/tests/system/rpz/ns3/hints ---- bin/tests/system/rpz/ns3/hints-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns3/hints 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns3/hints +=================================================================== +--- bin/tests/system/rpz/ns3/hints.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns3/hints 2013-08-05 14:14:45.909498434 +0200 @@ -1,4 +1,4 @@ -; Copyright (C) 2011, 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC") @@ -2708,9 +2725,10 @@ diff -r -u bin/tests/system/rpz/ns3/hints-orig bin/tests/system/rpz/ns3/hints . 120 NS ns. ns. 120 A 10.53.0.1 -diff -r -u bin/tests/system/rpz/ns3/named.conf-orig bin/tests/system/rpz/ns3/named.conf ---- bin/tests/system/rpz/ns3/named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns3/named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns3/named.conf +=================================================================== +--- bin/tests/system/rpz/ns3/named.conf.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns3/named.conf 2013-08-05 14:14:45.909498434 +0200 @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ @@ -2749,9 +2767,10 @@ diff -r -u bin/tests/system/rpz/ns3/named.conf-orig bin/tests/system/rpz/ns3/nam zone "crash1.tld2" {type master; file "crash1";}; zone "crash2.tld3." {type master; file "crash2";}; -diff -r -u bin/tests/system/rpz/ns4/hints-orig bin/tests/system/rpz/ns4/hints ---- bin/tests/system/rpz/ns4/hints-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns4/hints 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns4/hints +=================================================================== +--- bin/tests/system/rpz/ns4/hints.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns4/hints 2013-08-05 14:14:45.909498434 +0200 @@ -1,4 +1,4 @@ -; Copyright (C) 2011, 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC") @@ -2767,9 +2786,10 @@ diff -r -u bin/tests/system/rpz/ns4/hints-orig bin/tests/system/rpz/ns4/hints . 120 NS ns. ns. 120 A 10.53.0.1 -diff -r -u bin/tests/system/rpz/ns4/named.conf-orig bin/tests/system/rpz/ns4/named.conf ---- bin/tests/system/rpz/ns4/named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns4/named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns4/named.conf +=================================================================== +--- bin/tests/system/rpz/ns4/named.conf.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns4/named.conf 2013-08-05 14:14:45.910498444 +0200 @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ @@ -2779,9 +2799,10 @@ diff -r -u bin/tests/system/rpz/ns4/named.conf-orig bin/tests/system/rpz/ns4/nam controls { /* empty */ }; -diff -r -u bin/tests/system/rpz/ns4/tld4.db-orig bin/tests/system/rpz/ns4/tld4.db ---- bin/tests/system/rpz/ns4/tld4.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns4/tld4.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns4/tld4.db +=================================================================== +--- bin/tests/system/rpz/ns4/tld4.db.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns4/tld4.db 2013-08-05 14:14:45.910498444 +0200 @@ -12,8 +12,6 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. @@ -2791,9 +2812,10 @@ diff -r -u bin/tests/system/rpz/ns4/tld4.db-orig bin/tests/system/rpz/ns4/tld4.d ; RPZ rewrite responses from this zone -diff -r -u bin/tests/system/rpz/ns5/hints-orig bin/tests/system/rpz/ns5/hints ---- bin/tests/system/rpz/ns5/hints-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns5/hints 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns5/hints +=================================================================== +--- bin/tests/system/rpz/ns5/hints.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns5/hints 2013-08-05 14:14:45.910498444 +0200 @@ -12,8 +12,6 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. @@ -2803,9 +2825,10 @@ diff -r -u bin/tests/system/rpz/ns5/hints-orig bin/tests/system/rpz/ns5/hints . 120 NS ns. ns. 120 A 10.53.0.1 -diff -r -u bin/tests/system/rpz/ns5/named.conf-orig bin/tests/system/rpz/ns5/named.conf ---- bin/tests/system/rpz/ns5/named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns5/named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns5/named.conf +=================================================================== +--- bin/tests/system/rpz/ns5/named.conf.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns5/named.conf 2013-08-05 14:14:45.910498444 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") @@ -2843,18 +2866,20 @@ diff -r -u bin/tests/system/rpz/ns5/named.conf-orig bin/tests/system/rpz/ns5/nam +zone "bl17." {type master; file "bl.db"; }; +zone "bl18." {type master; file "bl.db"; }; +zone "bl19." {type master; file "bl.db"; }; -diff -r -u bin/tests/system/rpz/ns5/tld5.db-orig bin/tests/system/rpz/ns5/tld5.db ---- bin/tests/system/rpz/ns5/tld5.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/ns5/tld5.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/ns5/tld5.db +=================================================================== +--- bin/tests/system/rpz/ns5/tld5.db.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/ns5/tld5.db 2013-08-05 14:14:45.910498444 +0200 @@ -1,4 +1,4 @@ -; Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC") ; ; Permission to use, copy, modify, and/or distribute this software for any ; purpose with or without fee is hereby granted, provided that the above -diff -r -u bin/tests/system/rpz/qperf.sh-orig bin/tests/system/rpz/qperf.sh ---- bin/tests/system/rpz/qperf.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/qperf.sh 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/qperf.sh +=================================================================== +--- bin/tests/system/rpz/qperf.sh.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/qperf.sh 2013-08-05 14:14:45.910498444 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # @@ -2872,9 +2897,10 @@ diff -r -u bin/tests/system/rpz/qperf.sh-orig bin/tests/system/rpz/qperf.sh for QDIR in `echo "$PATH" | tr : ' '` ../../../../contrib/queryperf; do QPERF=$QDIR/queryperf -diff -r -u bin/tests/system/rpz/rpz.c-orig bin/tests/system/rpz/rpz.c ---- bin/tests/system/rpz/rpz.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/rpz.c 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/rpz.c +=================================================================== +--- bin/tests/system/rpz/rpz.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/rpz.c 2013-08-05 14:14:45.910498444 +0200 @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ @@ -2884,9 +2910,10 @@ diff -r -u bin/tests/system/rpz/rpz.c-orig bin/tests/system/rpz/rpz.c #include -diff -r -u bin/tests/system/rpz/setup.sh-orig bin/tests/system/rpz/setup.sh ---- bin/tests/system/rpz/setup.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/setup.sh 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/setup.sh +=================================================================== +--- bin/tests/system/rpz/setup.sh.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/setup.sh 2013-08-05 14:14:45.910498444 +0200 @@ -14,8 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. @@ -2917,9 +2944,10 @@ diff -r -u bin/tests/system/rpz/setup.sh-orig bin/tests/system/rpz/setup.sh } recursive-only no max-policy-ttl 90 # min-ns-dots 0 -diff -r -u bin/tests/system/rpz/test1-orig bin/tests/system/rpz/test1 ---- bin/tests/system/rpz/test1-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/test1 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/test1 +=================================================================== +--- bin/tests/system/rpz/test1.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/test1 2013-08-05 14:14:45.910498444 +0200 @@ -24,13 +24,13 @@ ; QNAME tests @@ -2959,9 +2987,10 @@ diff -r -u bin/tests/system/rpz/test1-orig bin/tests/system/rpz/test1 +; 32 +update add a3-8.tld2.bl. 300 CNAME rpz-drop. send -diff -r -u bin/tests/system/rpz/test2-orig bin/tests/system/rpz/test2 ---- bin/tests/system/rpz/test2-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/test2 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/test2 +=================================================================== +--- bin/tests/system/rpz/test2.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/test2 2013-08-05 14:14:45.910498444 +0200 @@ -58,7 +58,7 @@ send @@ -2980,36 +3009,40 @@ diff -r -u bin/tests/system/rpz/test2-orig bin/tests/system/rpz/test2 +; 17 +update add 32.1.0.53.10.rpz-client-ip.bl 300 A 127.0.0.17 +send -diff -r -u bin/tests/system/rpz/test3-orig bin/tests/system/rpz/test3 ---- bin/tests/system/rpz/test3-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/test3 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/test3 +=================================================================== +--- bin/tests/system/rpz/test3.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/test3 2013-08-05 14:14:45.910498444 +0200 @@ -1,4 +1,4 @@ -; Copyright (C) 2011, 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC") ; ; Permission to use, copy, modify, and/or distribute this software for any ; purpose with or without fee is hereby granted, provided that the above -diff -r -u bin/tests/system/rpz/test4-orig bin/tests/system/rpz/test4 ---- bin/tests/system/rpz/test4-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/test4 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/test4 +=================================================================== +--- bin/tests/system/rpz/test4.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/test4 2013-08-05 14:14:45.911498455 +0200 @@ -1,4 +1,4 @@ -; Copyright (C) 2011, 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC") ; ; Permission to use, copy, modify, and/or distribute this software for any ; purpose with or without fee is hereby granted, provided that the above -diff -r -u bin/tests/system/rpz/test4a-orig bin/tests/system/rpz/test4a ---- bin/tests/system/rpz/test4a-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/test4a 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/test4a +=================================================================== +--- bin/tests/system/rpz/test4a.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/test4a 2013-08-05 14:14:45.911498455 +0200 @@ -1,4 +1,4 @@ -; Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC") ; ; Permission to use, copy, modify, and/or distribute this software for any ; purpose with or without fee is hereby granted, provided that the above -diff -r -u bin/tests/system/rpz/test5-orig bin/tests/system/rpz/test5 ---- bin/tests/system/rpz/test5-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/test5 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/test5 +=================================================================== +--- bin/tests/system/rpz/test5.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/test5 2013-08-05 14:14:45.911498455 +0200 @@ -57,3 +57,6 @@ ; 16 update add a3-16.tld2.bl. 300 A 127.0.0.16 @@ -3017,9 +3050,10 @@ diff -r -u bin/tests/system/rpz/test5-orig bin/tests/system/rpz/test5 +; 18 +update add a3-18.tld2.bl-drop. 300 A 127.0.0.18 +send -diff -r -u bin/tests/system/rpz/tests.sh-orig bin/tests/system/rpz/tests.sh ---- bin/tests/system/rpz/tests.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rpz/tests.sh 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rpz/tests.sh +=================================================================== +--- bin/tests/system/rpz/tests.sh.orig 2013-07-17 00:13:06.000000000 +0200 ++++ bin/tests/system/rpz/tests.sh 2013-08-05 14:14:45.911498455 +0200 @@ -12,8 +12,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. @@ -3197,9 +3231,10 @@ diff -r -u bin/tests/system/rpz/tests.sh-orig bin/tests/system/rpz/tests.sh # restart the main test RPZ server to see if that creates a core file if test -z "$HAVE_CORE"; then $PERL $SYSTEMTESTTOP/stop.pl . ns3 -diff -r -u bin/tests/system/rrl/clean.sh-orig bin/tests/system/rrl/clean.sh ---- bin/tests/system/rrl/clean.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/clean.sh 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/clean.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/clean.sh 2013-08-05 14:14:45.911498455 +0200 @@ -0,0 +1,21 @@ +# Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +# @@ -3222,9 +3257,10 @@ diff -r -u bin/tests/system/rrl/clean.sh-orig bin/tests/system/rrl/clean.sh +rm -f dig.out* +rm -f */named.memstats */named.run */named.stats */log-* */session.key +rm -f ns3/bl*.db */*.jnl */*.core */*.pid -diff -r -u bin/tests/system/rrl/ns1/named.conf-orig bin/tests/system/rrl/ns1/named.conf ---- bin/tests/system/rrl/ns1/named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/ns1/named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/ns1/named.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/ns1/named.conf 2013-08-05 14:14:45.911498455 +0200 @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") @@ -3258,9 +3294,10 @@ diff -r -u bin/tests/system/rrl/ns1/named.conf-orig bin/tests/system/rrl/ns1/nam +}; + +zone "." {type master; file "root.db";}; -diff -r -u bin/tests/system/rrl/ns1/root.db-orig bin/tests/system/rrl/ns1/root.db ---- bin/tests/system/rrl/ns1/root.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/ns1/root.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/ns1/root.db +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/ns1/root.db 2013-08-05 14:14:45.911498455 +0200 @@ -0,0 +1,31 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -3293,9 +3330,10 @@ diff -r -u bin/tests/system/rrl/ns1/root.db-orig bin/tests/system/rrl/ns1/root.d + +; generate SERVFAIL +tld4. NS ns.tld3. -diff -r -u bin/tests/system/rrl/ns2/hints-orig bin/tests/system/rrl/ns2/hints ---- bin/tests/system/rrl/ns2/hints-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/ns2/hints 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/ns2/hints +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/ns2/hints 2013-08-05 14:14:45.911498455 +0200 @@ -0,0 +1,18 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -3315,9 +3353,10 @@ diff -r -u bin/tests/system/rrl/ns2/hints-orig bin/tests/system/rrl/ns2/hints + +. 0 NS ns1. +ns1. 0 A 10.53.0.1 -diff -r -u bin/tests/system/rrl/ns2/named.conf-orig bin/tests/system/rrl/ns2/named.conf ---- bin/tests/system/rrl/ns2/named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/ns2/named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/ns2/named.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/ns2/named.conf 2013-08-05 14:14:45.912498466 +0200 @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") @@ -3390,9 +3429,10 @@ diff -r -u bin/tests/system/rrl/ns2/named.conf-orig bin/tests/system/rrl/ns2/nam +zone "." { type hint; file "hints"; }; + +zone "tld2."{ type master; file "tld2.db"; }; -diff -r -u bin/tests/system/rrl/ns2/tld2.db-orig bin/tests/system/rrl/ns2/tld2.db ---- bin/tests/system/rrl/ns2/tld2.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/ns2/tld2.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/ns2/tld2.db +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/ns2/tld2.db 2013-08-05 14:14:45.912498466 +0200 @@ -0,0 +1,47 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -3441,9 +3481,10 @@ diff -r -u bin/tests/system/rrl/ns2/tld2.db-orig bin/tests/system/rrl/ns2/tld2.d + +; a9 for all-per-second limit +$GENERATE 101-180 all$.a9 A 192.0.2.8 -diff -r -u bin/tests/system/rrl/ns3/hints-orig bin/tests/system/rrl/ns3/hints ---- bin/tests/system/rrl/ns3/hints-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/ns3/hints 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/ns3/hints +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/ns3/hints 2013-08-05 14:14:45.912498466 +0200 @@ -0,0 +1,18 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -3463,9 +3504,10 @@ diff -r -u bin/tests/system/rrl/ns3/hints-orig bin/tests/system/rrl/ns3/hints + +. 0 NS ns1. +ns1. 0 A 10.53.0.1 -diff -r -u bin/tests/system/rrl/ns3/named.conf-orig bin/tests/system/rrl/ns3/named.conf ---- bin/tests/system/rrl/ns3/named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/ns3/named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/ns3/named.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/ns3/named.conf 2013-08-05 14:14:45.912498466 +0200 @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") @@ -3517,9 +3559,10 @@ diff -r -u bin/tests/system/rrl/ns3/named.conf-orig bin/tests/system/rrl/ns3/nam +zone "." { type hint; file "hints"; }; + +zone "tld3."{ type master; file "tld3.db"; }; -diff -r -u bin/tests/system/rrl/ns3/tld3.db-orig bin/tests/system/rrl/ns3/tld3.db ---- bin/tests/system/rrl/ns3/tld3.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/ns3/tld3.db 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/ns3/tld3.db +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/ns3/tld3.db 2013-08-05 14:14:45.912498466 +0200 @@ -0,0 +1,25 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -3546,9 +3589,10 @@ diff -r -u bin/tests/system/rrl/ns3/tld3.db-orig bin/tests/system/rrl/ns3/tld3.d +ns A 10.53.0.3 + +*.a3 A 192.0.3.3 -diff -r -u bin/tests/system/rrl/setup.sh-orig bin/tests/system/rrl/setup.sh ---- bin/tests/system/rrl/setup.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/setup.sh 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/setup.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/setup.sh 2013-08-05 14:14:45.912498466 +0200 @@ -0,0 +1,21 @@ +#!/bin/sh +# @@ -3571,9 +3615,10 @@ diff -r -u bin/tests/system/rrl/setup.sh-orig bin/tests/system/rrl/setup.sh +. $SYSTEMTESTTOP/conf.sh +. ./clean.sh + -diff -r -u bin/tests/system/rrl/tests.sh-orig bin/tests/system/rrl/tests.sh ---- bin/tests/system/rrl/tests.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ bin/tests/system/rrl/tests.sh 2004-01-01 00:00:00.000000000 +0000 +Index: bin/tests/system/rrl/tests.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ bin/tests/system/rrl/tests.sh 2013-08-05 14:14:45.912498466 +0200 @@ -0,0 +1,258 @@ +# Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +# @@ -3833,9 +3878,10 @@ diff -r -u bin/tests/system/rrl/tests.sh-orig bin/tests/system/rrl/tests.sh +# exit $ret +[ $ret -ne 0 ] && echo "I:test failure overridden" +exit 0 -diff -r -u clean.sh-orig clean.sh ---- clean.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ clean.sh 2004-01-01 00:00:00.000000000 +0000 +Index: clean.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ clean.sh 2013-08-05 14:14:45.912498466 +0200 @@ -0,0 +1,21 @@ +# Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +# @@ -3858,9 +3904,10 @@ diff -r -u clean.sh-orig clean.sh +rm -f dig.out* +rm -f */named.memstats */named.run */named.stats */log-* */session.key +rm -f ns3/bl*.db */*.jnl */*.core */*.pid -diff -r -u doc/arm/Bv9ARM-book.xml-orig doc/arm/Bv9ARM-book.xml ---- doc/arm/Bv9ARM-book.xml-orig 2004-01-01 00:00:00.000000000 +0000 -+++ doc/arm/Bv9ARM-book.xml 2004-01-01 00:00:00.000000000 +0000 +Index: doc/arm/Bv9ARM-book.xml +=================================================================== +--- doc/arm/Bv9ARM-book.xml.orig 2013-07-17 00:13:06.000000000 +0200 ++++ doc/arm/Bv9ARM-book.xml 2013-08-05 14:14:45.916498518 +0200 @@ -4818,6 +4818,32 @@ @@ -4396,9 +4443,10 @@ diff -r -u doc/arm/Bv9ARM-book.xml-orig doc/arm/Bv9ARM-book.xml -diff -r -u hints-orig hints ---- hints-orig 2004-01-01 00:00:00.000000000 +0000 -+++ hints 2004-01-01 00:00:00.000000000 +0000 +Index: hints +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ hints 2013-08-05 14:14:45.916498518 +0200 @@ -0,0 +1,36 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -4436,9 +4484,10 @@ diff -r -u hints-orig hints + +. 0 NS ns1. +ns1. 0 A 10.53.0.1 -diff -r -u lib/dns/Makefile.in-orig lib/dns/Makefile.in ---- lib/dns/Makefile.in-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/Makefile.in 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/Makefile.in +=================================================================== +--- lib/dns/Makefile.in.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/Makefile.in 2013-08-05 14:14:45.916498518 +0200 @@ -67,8 +67,8 @@ portlist.@O@ private.@O@ \ rbt.@O@ rbtdb.@O@ rbtdb64.@O@ rcode.@O@ rdata.@O@ \ @@ -4459,9 +4508,10 @@ diff -r -u lib/dns/Makefile.in-orig lib/dns/Makefile.in sdb.c sdlz.c soa.c ssu.c ssu_external.c \ stats.c tcpmsg.c time.c timer.c tkey.c \ tsec.c tsig.c ttl.c update.c validator.c \ -diff -r -u lib/dns/db.c-orig lib/dns/db.c ---- lib/dns/db.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/db.c 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/db.c +=================================================================== +--- lib/dns/db.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/db.c 2013-08-05 14:14:45.916498518 +0200 @@ -1007,21 +1007,23 @@ (db->methods->resigned)(db, rdataset, version); } @@ -4501,9 +4551,10 @@ diff -r -u lib/dns/db.c-orig lib/dns/db.c + return (ISC_R_SUCCESS); + return ((db->methods->rpz_ready)(db)); } -diff -r -u lib/dns/ecdb.c-orig lib/dns/ecdb.c ---- lib/dns/ecdb.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/ecdb.c 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/ecdb.c +=================================================================== +--- lib/dns/ecdb.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/ecdb.c 2013-08-05 14:14:45.916498518 +0200 @@ -582,8 +582,8 @@ NULL, /* resigned */ NULL, /* isdnssec */ @@ -4515,9 +4566,10 @@ diff -r -u lib/dns/ecdb.c-orig lib/dns/ecdb.c NULL, /* findnodeext */ NULL /* findext */ }; -diff -r -u lib/dns/include/dns/db.h-orig lib/dns/include/dns/db.h ---- lib/dns/include/dns/db.h-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/include/dns/db.h 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/include/dns/db.h +=================================================================== +--- lib/dns/include/dns/db.h.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/include/dns/db.h 2013-08-05 14:14:45.917498530 +0200 @@ -172,14 +172,9 @@ dns_dbversion_t *version); isc_boolean_t (*isdnssec)(dns_db_t *db); @@ -4575,9 +4627,10 @@ diff -r -u lib/dns/include/dns/db.h-orig lib/dns/include/dns/db.h */ ISC_LANG_ENDDECLS -diff -r -u lib/dns/include/dns/log.h-orig lib/dns/include/dns/log.h ---- lib/dns/include/dns/log.h-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/include/dns/log.h 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/include/dns/log.h +=================================================================== +--- lib/dns/include/dns/log.h.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/include/dns/log.h 2013-08-05 14:14:45.917498530 +0200 @@ -43,6 +43,7 @@ #define DNS_LOGCATEGORY_DELEGATION_ONLY (&dns_categories[10]) #define DNS_LOGCATEGORY_EDNS_DISABLED (&dns_categories[11]) @@ -4586,9 +4639,10 @@ diff -r -u lib/dns/include/dns/log.h-orig lib/dns/include/dns/log.h /* Backwards compatibility. */ #define DNS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL -diff -r -u lib/dns/include/dns/rpz.h-orig lib/dns/include/dns/rpz.h ---- lib/dns/include/dns/rpz.h-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/include/dns/rpz.h 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/include/dns/rpz.h +=================================================================== +--- lib/dns/include/dns/rpz.h.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/include/dns/rpz.h 2013-08-05 14:14:45.917498530 +0200 @@ -14,7 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ @@ -4907,9 +4961,10 @@ diff -r -u lib/dns/include/dns/rpz.h-orig lib/dns/include/dns/rpz.h ISC_LANG_ENDDECLS -diff -r -u lib/dns/include/dns/rrl.h-orig lib/dns/include/dns/rrl.h ---- lib/dns/include/dns/rrl.h-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/include/dns/rrl.h 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/include/dns/rrl.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lib/dns/include/dns/rrl.h 2013-08-05 14:14:45.917498530 +0200 @@ -0,0 +1,278 @@ +/* + * Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") @@ -5189,9 +5244,10 @@ diff -r -u lib/dns/include/dns/rrl.h-orig lib/dns/include/dns/rrl.h +ISC_LANG_ENDDECLS + +#endif /* DNS_RRL_H */ -diff -r -u lib/dns/include/dns/view.h-orig lib/dns/include/dns/view.h ---- lib/dns/include/dns/view.h-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/include/dns/view.h 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/include/dns/view.h +=================================================================== +--- lib/dns/include/dns/view.h.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/include/dns/view.h 2013-08-05 14:14:45.918498542 +0200 @@ -73,6 +73,7 @@ #include @@ -5220,9 +5276,10 @@ diff -r -u lib/dns/include/dns/view.h-orig lib/dns/include/dns/view.h /* * Configurable data for server use only, -diff -r -u lib/dns/include/dns/zone.h-orig lib/dns/include/dns/zone.h ---- lib/dns/include/dns/zone.h-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/include/dns/zone.h 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/include/dns/zone.h +=================================================================== +--- lib/dns/include/dns/zone.h.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/include/dns/zone.h 2013-08-05 14:14:45.918498542 +0200 @@ -2081,13 +2081,14 @@ */ @@ -5241,9 +5298,10 @@ diff -r -u lib/dns/include/dns/zone.h-orig lib/dns/include/dns/zone.h void dns_zone_setstatlevel(dns_zone_t *zone, dns_zonestat_level_t level); -diff -r -u lib/dns/log.c-orig lib/dns/log.c ---- lib/dns/log.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/log.c 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/log.c +=================================================================== +--- lib/dns/log.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/log.c 2013-08-05 14:14:45.918498542 +0200 @@ -45,6 +45,7 @@ { "delegation-only", 0 }, { "edns-disabled", 0 }, @@ -5252,9 +5310,10 @@ diff -r -u lib/dns/log.c-orig lib/dns/log.c { NULL, 0 } }; -diff -r -u lib/dns/rbtdb.c-orig lib/dns/rbtdb.c ---- lib/dns/rbtdb.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/rbtdb.c 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/rbtdb.c +=================================================================== +--- lib/dns/rbtdb.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/rbtdb.c 2013-08-05 14:14:45.919498555 +0200 @@ -453,7 +453,9 @@ dns_rbt_t * tree; dns_rbt_t * nsec; @@ -5452,12 +5511,12 @@ diff -r -u lib/dns/rbtdb.c-orig lib/dns/rbtdb.c - default: - continue; - } -- + - result = dns_rpz_cidr_find(rbtdb->rpz_cidr, &netaddr, rpz_type, - selfname, qname, &prefix); - if (result != ISC_R_SUCCESS) - continue; - +- - /* - * If we already have a rule, discard this new rule if - * is not better. @@ -5650,9 +5709,10 @@ diff -r -u lib/dns/rbtdb.c-orig lib/dns/rbtdb.c /* * Version Initialization. -diff -r -u lib/dns/rpz.c-orig lib/dns/rpz.c ---- lib/dns/rpz.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/rpz.c 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/rpz.c +=================================================================== +--- lib/dns/rpz.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/rpz.c 2013-08-05 14:14:45.921498580 +0200 @@ -37,6 +37,7 @@ #include #include @@ -8117,9 +8177,10 @@ diff -r -u lib/dns/rpz.c-orig lib/dns/rpz.c */ if (dns_name_equal(&cname.cname, &rpz->passthru)) return (DNS_RPZ_POLICY_PASSTHRU); -diff -r -u lib/dns/rrl.c-orig lib/dns/rrl.c ---- lib/dns/rrl.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/rrl.c 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/rrl.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lib/dns/rrl.c 2013-08-05 14:14:45.921498580 +0200 @@ -0,0 +1,1324 @@ +/* + * Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") @@ -9445,9 +9506,10 @@ diff -r -u lib/dns/rrl.c-orig lib/dns/rrl.c + *rrlp = rrl; + return (ISC_R_SUCCESS); +} -diff -r -u lib/dns/view.c-orig lib/dns/view.c ---- lib/dns/view.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/view.c 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/view.c +=================================================================== +--- lib/dns/view.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/view.c 2013-08-05 14:14:45.922498593 +0200 @@ -49,6 +49,7 @@ #include #include @@ -9491,9 +9553,10 @@ diff -r -u lib/dns/view.c-orig lib/dns/view.c #endif if (view->requestmgr != NULL) dns_requestmgr_detach(&view->requestmgr); -diff -r -u lib/dns/win32/libdns.def-orig lib/dns/win32/libdns.def ---- lib/dns/win32/libdns.def-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/win32/libdns.def 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/win32/libdns.def +=================================================================== +--- lib/dns/win32/libdns.def.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/win32/libdns.def 2013-08-05 14:14:45.922498593 +0200 @@ -130,8 +130,8 @@ dns_db_overmem dns_db_printnode @@ -9568,9 +9631,10 @@ diff -r -u lib/dns/win32/libdns.def-orig lib/dns/win32/libdns.def dns_zone_rpz_enable dns_zone_setacache dns_zone_setadded -diff -r -u lib/dns/win32/libdns.dsp-orig lib/dns/win32/libdns.dsp ---- lib/dns/win32/libdns.dsp-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/win32/libdns.dsp 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/win32/libdns.dsp +=================================================================== +--- lib/dns/win32/libdns.dsp.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/win32/libdns.dsp 2013-08-05 14:14:45.922498593 +0200 @@ -346,6 +346,10 @@ # End Source File # Begin Source File @@ -9593,9 +9657,10 @@ diff -r -u lib/dns/win32/libdns.dsp-orig lib/dns/win32/libdns.dsp SOURCE=..\rriterator.c # End Source File # Begin Source File -diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak ---- lib/dns/win32/libdns.mak-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/win32/libdns.mak 2004-01-01 00:00:00.000000000 +0000 +Index: lib/dns/win32/libdns.mak +=================================================================== +--- lib/dns/win32/libdns.mak.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/win32/libdns.mak 2013-08-05 14:14:45.922498593 +0200 @@ -184,6 +184,7 @@ -@erase "$(INTDIR)\result.obj" -@erase "$(INTDIR)\rootns.obj" @@ -9637,10 +9702,12 @@ diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak "$(INTDIR)\rriterator.obj" \ "$(INTDIR)\sdb.obj" \ "$(INTDIR)\sdlz.obj" \ -@@ -1726,6 +1732,24 @@ +@@ -1724,6 +1730,24 @@ + $(CPP) $(CPP_PROJ) $(SOURCE) - !ENDIF ++!ENDIF ++ +SOURCE=..\rrl.c + +!IF "$(CFG)" == "libdns - Win32 Release" @@ -9657,14 +9724,13 @@ diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak + $(CPP) $(CPP_PROJ) $(SOURCE) + + -+!ENDIF -+ - SOURCE=..\rriterator.c + !ENDIF - !IF "$(CFG)" == "libdns - Win32 Release" -diff -r -u lib/dns/zone.c-orig lib/dns/zone.c ---- lib/dns/zone.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/dns/zone.c 2004-01-01 00:00:00.000000000 +0000 + SOURCE=..\rriterator.c +Index: lib/dns/zone.c +=================================================================== +--- lib/dns/zone.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/dns/zone.c 2013-08-05 14:14:45.925498630 +0200 @@ -346,9 +346,10 @@ isc_boolean_t added; @@ -9783,9 +9849,10 @@ diff -r -u lib/dns/zone.c-orig lib/dns/zone.c result = zone_get_from_db(zone, db, &nscount, &soacount, NULL, NULL, NULL, NULL, NULL, NULL); if (result == ISC_R_SUCCESS) { -diff -r -u lib/isccfg/namedconf.c-orig lib/isccfg/namedconf.c ---- lib/isccfg/namedconf.c-orig 2004-01-01 00:00:00.000000000 +0000 -+++ lib/isccfg/namedconf.c 2004-01-01 00:00:00.000000000 +0000 +Index: lib/isccfg/namedconf.c +=================================================================== +--- lib/isccfg/namedconf.c.orig 2013-07-17 00:13:06.000000000 +0200 ++++ lib/isccfg/namedconf.c 2013-08-05 14:14:45.937498781 +0200 @@ -1054,11 +1054,12 @@ /*% @@ -9880,9 +9947,10 @@ diff -r -u lib/isccfg/namedconf.c-orig lib/isccfg/namedconf.c { NULL, NULL, 0 } }; -diff -r -u named.conf-orig named.conf ---- named.conf-orig 2004-01-01 00:00:00.000000000 +0000 -+++ named.conf 2004-01-01 00:00:00.000000000 +0000 +Index: named.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ named.conf 2013-08-05 14:14:45.937498781 +0200 @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") @@ -10037,9 +10105,10 @@ diff -r -u named.conf-orig named.conf +}; + +zone "." {type master; file "root.db";}; -diff -r -u root.db-orig root.db ---- root.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ root.db 2004-01-01 00:00:00.000000000 +0000 +Index: root.db +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ root.db 2013-08-05 14:14:45.938498793 +0200 @@ -0,0 +1,31 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -10072,9 +10141,10 @@ diff -r -u root.db-orig root.db + +; generate SERVFAIL +tld4. NS ns.tld3. -diff -r -u setup.sh-orig setup.sh ---- setup.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ setup.sh 2004-01-01 00:00:00.000000000 +0000 +Index: setup.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ setup.sh 2013-08-05 14:14:45.938498793 +0200 @@ -0,0 +1,21 @@ +#!/bin/sh +# @@ -10097,9 +10167,10 @@ diff -r -u setup.sh-orig setup.sh +. $SYSTEMTESTTOP/conf.sh +. ./clean.sh + -diff -r -u tests.sh-orig tests.sh ---- tests.sh-orig 2004-01-01 00:00:00.000000000 +0000 -+++ tests.sh 2004-01-01 00:00:00.000000000 +0000 +Index: tests.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ tests.sh 2013-08-05 14:14:45.938498793 +0200 @@ -0,0 +1,258 @@ +# Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +# @@ -10359,9 +10430,10 @@ diff -r -u tests.sh-orig tests.sh +# exit $ret +[ $ret -ne 0 ] && echo "I:test failure overridden" +exit 0 -diff -r -u tld2.db-orig tld2.db ---- tld2.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ tld2.db 2004-01-01 00:00:00.000000000 +0000 +Index: tld2.db +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ tld2.db 2013-08-05 14:14:45.938498793 +0200 @@ -0,0 +1,47 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -10410,9 +10482,10 @@ diff -r -u tld2.db-orig tld2.db + +; a9 for all-per-second limit +$GENERATE 101-180 all$.a9 A 192.0.2.8 -diff -r -u tld3.db-orig tld3.db ---- tld3.db-orig 2004-01-01 00:00:00.000000000 +0000 -+++ tld3.db 2004-01-01 00:00:00.000000000 +0000 +Index: tld3.db +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ tld3.db 2013-08-05 14:14:45.938498793 +0200 @@ -0,0 +1,25 @@ +; Copyright (C) 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +; @@ -10439,9 +10512,10 @@ diff -r -u tld3.db-orig tld3.db +ns A 10.53.0.3 + +*.a3 A 192.0.3.3 -diff -r -u version-orig version ---- version-orig 2004-01-01 00:00:00.000000000 +0000 -+++ version 2004-01-01 00:00:00.000000000 +0000 +Index: version +=================================================================== +--- version.orig 2013-07-17 00:13:06.000000000 +0200 ++++ version 2013-08-05 14:14:45.938498793 +0200 @@ -7,6 +7,6 @@ DESCRIPTION="(Extended Support Version)" MAJORVER=9 @@ -10449,4 +10523,4 @@ diff -r -u version-orig version -PATCHVER=3 +PATCHVER=3-rpz2+rl.156.01 RELEASETYPE=-P - RELEASEVER=1 + RELEASEVER=2