diff --git a/CHANGES b/CHANGES index aaa032a004..c1202820e7 100644 --- a/CHANGES +++ b/CHANGES @@ -8,7 +8,7 @@ The recursion depth limit is configured via the "max-recursion-depth" option, and the query limit - via the "max-recursion-queries" option. [RT #37580] + via the "max-recursion-queries" option. [RT #37580] 4005. [func] The buffer used for returning text from rndc commands is now dynamically resizable, allowing diff --git a/bin/tests/system/reclimit/README b/bin/tests/system/reclimit/README index b802a057ef..069f105a11 100644 --- a/bin/tests/system/reclimit/README +++ b/bin/tests/system/reclimit/README @@ -1,3 +1,6 @@ +Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. + system test for recursion limits ns1 -- root server diff --git a/bin/tests/system/reclimit/ans2/ans.pl b/bin/tests/system/reclimit/ans2/ans.pl index a6e39a6a94..b9663a074c 100644 --- a/bin/tests/system/reclimit/ans2/ans.pl +++ b/bin/tests/system/reclimit/ans2/ans.pl @@ -1,4 +1,18 @@ #!/usr/bin/env perl +# +# Copyright (C) 2014 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 +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. use strict; use warnings; diff --git a/bin/tests/system/reclimit/ns3/named1.conf b/bin/tests/system/reclimit/ns3/named1.conf index 558c230a5c..ec5770232b 100644 --- a/bin/tests/system/reclimit/ns3/named1.conf +++ b/bin/tests/system/reclimit/ns3/named1.conf @@ -25,8 +25,8 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - servfail-ttl 0; - max-recursion-depth 12; + servfail-ttl 0; + max-recursion-depth 12; }; key rndc_key { diff --git a/bin/tests/system/reclimit/ns3/named2.conf b/bin/tests/system/reclimit/ns3/named2.conf index eb1fa09f63..fb27f011c4 100644 --- a/bin/tests/system/reclimit/ns3/named2.conf +++ b/bin/tests/system/reclimit/ns3/named2.conf @@ -25,8 +25,8 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - servfail-ttl 0; - max-recursion-depth 5; + servfail-ttl 0; + max-recursion-depth 5; }; key rndc_key { diff --git a/bin/tests/system/reclimit/ns3/named3.conf b/bin/tests/system/reclimit/ns3/named3.conf index 1c3679a89e..953a6adc30 100644 --- a/bin/tests/system/reclimit/ns3/named3.conf +++ b/bin/tests/system/reclimit/ns3/named3.conf @@ -25,8 +25,8 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - servfail-ttl 0; - max-recursion-depth 100; + servfail-ttl 0; + max-recursion-depth 100; }; key rndc_key { diff --git a/bin/tests/system/reclimit/ns3/named4.conf b/bin/tests/system/reclimit/ns3/named4.conf index 46da44803c..442dae1d97 100644 --- a/bin/tests/system/reclimit/ns3/named4.conf +++ b/bin/tests/system/reclimit/ns3/named4.conf @@ -25,9 +25,9 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - servfail-ttl 0; - max-recursion-depth 100; - max-recursion-queries 40; + servfail-ttl 0; + max-recursion-depth 100; + max-recursion-queries 40; }; key rndc_key {