This commit was manufactured by cvs2git to create tag 'v9_9_0rc1'.

CHANGES

@@ -1,6 +1,3 @@
-3260.	[bug]		"rrset-order cyclic" could appears to not rotate
-			for some query patterns.  [RT #27170]
-
 	--- 9.9.0rc1 released ---
 
 3259.	[bug]		named-compilezone: Suppress "dump zone to <file>"

bin/tests/system/rrsetorder/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2008, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2006-2008  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
@@ -14,9 +14,8 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.10 2011/12/23 23:47:13 tbox Exp $
+# $Id: clean.sh,v 1.8 2008/04/24 23:46:59 tbox Exp $
 
-rm -f dig.out.test*
 rm -f dig.out.cyclic dig.out.fixed dig.out.random
 rm -f dig.out.0 dig.out.1 dig.out.2 dig.out.3
 rm -f ns2/root.bk

bin/tests/system/rrsetorder/dig.out.cyclic.fixed1

@@ -1,4 +0,0 @@
-1.2.3.4
-1.2.3.3
-1.2.3.2
-1.2.3.1

bin/tests/system/rrsetorder/dig.out.cyclic.fixed2

@@ -1,4 +0,0 @@
-1.2.3.3
-1.2.3.2
-1.2.3.1
-1.2.3.4

bin/tests/system/rrsetorder/dig.out.cyclic.fixed3

@@ -1,4 +0,0 @@
-1.2.3.2
-1.2.3.1
-1.2.3.4
-1.2.3.3

bin/tests/system/rrsetorder/dig.out.cyclic.fixed4

@@ -1,4 +0,0 @@
-1.2.3.1
-1.2.3.4
-1.2.3.3
-1.2.3.2

bin/tests/system/rrsetorder/dig.out.cyclic.good1

@@ -1,4 +0,0 @@
-1.2.3.1
-1.2.3.2
-1.2.3.3
-1.2.3.4

bin/tests/system/rrsetorder/dig.out.cyclic.good2

@@ -1,4 +0,0 @@
-1.2.3.2
-1.2.3.3
-1.2.3.4
-1.2.3.1

bin/tests/system/rrsetorder/dig.out.cyclic.good3

@@ -1,4 +0,0 @@
-1.2.3.3
-1.2.3.4
-1.2.3.1
-1.2.3.2

bin/tests/system/rrsetorder/dig.out.cyclic.good4

@@ -1,4 +0,0 @@
-1.2.3.4
-1.2.3.1
-1.2.3.2
-1.2.3.3

bin/tests/system/rrsetorder/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2008, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2006-2008  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
@@ -14,13 +14,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.11 2011/12/23 23:47:13 tbox Exp $
+# $Id: tests.sh,v 1.8 2008/10/09 21:27:52 each Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 status=0
-n=0
 
 if grep "^#define DNS_RDATASET_FIXED" $TOP/config.h > /dev/null 2>&1 ; then
         test_fixed=true
@@ -32,65 +31,47 @@ fi
 #
 #
 #
-n=`expr $n + 1`
 if $test_fixed; then
-    echo "I: Checking order fixed (master) ($n)"
+    echo "I: Checking order fixed (master)"
+    ret=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
-    ret=0
     $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
-	    -p 5300 @10.53.0.1 fixed.example > dig.out.test$n || ret=1
-    cmp -s dig.out.test$n dig.out.fixed.good || ret=1
-    [ $ret = 0 ] && break
+	    -p 5300 @10.53.0.1 fixed.example > dig.out.fixed || ret=1
+    cmp -s dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
-else
-    echo "I: Skipped: Checking order fixed (master) ($n)"
 fi
 
 #
 #
 #
-n=`expr $n + 1`
-echo "I: Checking order cyclic (master) ($n)"
+echo "I: Checking order cyclic (master)"
 ret=0
-for i in 1 2 3 4
+matches=0
+for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-	eval match$i=0
+    j=`expr $i % 4`
+    $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
+	    -p 5300 @10.53.0.1 cyclic.example > dig.out.cyclic || ret=1
+    if [ $i -le 4 ]; then
+        cp dig.out.cyclic dig.out.$j
+    else
+        cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
+    fi
 done
-for i in a b c d e f g h
-do
-$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
-	-p 5300 @10.53.0.1 cyclic.example > dig.out.cyclic || ret=1
-	match=0
-	for j in 1 2 3 4
-	do
-		if $test_fixed; then
-			cmp -s dig.out.cyclic dig.out.cyclic.fixed$j && {
-				eval "match$j=1 match=1";
-			}
-		else
-			cmp -s dig.out.cyclic dig.out.cyclic.good$j && {
-				eval "match$j=1 match=1";
-			}
-		fi
-		if [ $match -eq 1 ]; then break; fi
-	done
-	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; cat dig.out.cyclic; fi
-done
-match=0
-for i in 1 2 3 4
-do
-	eval "match=\`expr \$match + \$match$i\`"
-done
-echo "I: Cyclic selection return $match of 4 possible orders in 8 samples"
-if [ $match -ne 4 ]; then echo ret=1; fi
+cmp -s dig.out.0 dig.out.1 && ret=1
+cmp -s dig.out.0 dig.out.2 && ret=1
+cmp -s dig.out.0 dig.out.3 && ret=1
+cmp -s dig.out.1 dig.out.2 && ret=1
+cmp -s dig.out.1 dig.out.3 && ret=1
+cmp -s dig.out.2 dig.out.3 && ret=1
+if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-n=`expr $n + 1`
-echo "I: Checking order random (master) ($n)"
+echo "I: Checking order random (master)"
 ret=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 do
@@ -121,64 +102,47 @@ status=`expr $status + $ret`
 #
 #
 #
-n=`expr $n + 1`
 if $test_fixed; then
-    echo "I: Checking order fixed (slave) ($n)"
+    echo "I: Checking order fixed (slave)"
     ret=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
-	    -p 5300 @10.53.0.2 fixed.example > dig.out.test$n || ret=1
-    cmp -s dig.out.test$n dig.out.fixed.good || ret=1
+	    -p 5300 @10.53.0.2 fixed.example > dig.out.fixed || ret=1
+    cmp -s dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
-else
-    echo "I: Skipped: Checking order fixed (slave) ($n)"
 fi
 
 #
 #
 #
-n=`expr $n + 1`
-echo "I: Checking order cyclic (slave) ($n)"
+echo "I: Checking order cyclic (slave)"
 ret=0
-for i in 1 2 3 4
+matches=0
+for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-	eval match$i=0
+    j=`expr $i % 4`
+    $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
+	    -p 5300 @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1
+    if [ $i -le 4 ]; then
+        cp dig.out.cyclic dig.out.$j
+    else
+        cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
+    fi
 done
-for i in a b c d e f g h
-do
-$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
-	-p 5300 @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1
-	match=0
-	for j in 1 2 3 4
-	do
-		if $test_fixed; then
-			cmp -s dig.out.cyclic dig.out.cyclic.fixed$j && {
-				eval "match$j=1 match=1";
-			}
-		else
-			cmp -s dig.out.cyclic dig.out.cyclic.good$j && {
-				eval "match$j=1 match=1";
-			}
-		fi
-		if [ $match -eq 1 ]; then break; fi
-	done
-	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; fi
-done
-match=0
-for i in 1 2 3 4
-do
-	eval "match=\`expr \$match + \$match$i\`"
-done
-echo "I: Cyclic selection return $match of 4 possible orders in 8 samples"
-if [ $match -ne 4 ]; then echo ret=1; fi
+cmp -s dig.out.0 dig.out.1 && ret=1
+cmp -s dig.out.0 dig.out.2 && ret=1
+cmp -s dig.out.0 dig.out.3 && ret=1
+cmp -s dig.out.1 dig.out.2 && ret=1
+cmp -s dig.out.1 dig.out.3 && ret=1
+cmp -s dig.out.2 dig.out.3 && ret=1
+if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-n=`expr $n + 1`
-echo "I: Checking order random (slave) ($n)"
+echo "I: Checking order random (slave)"
 ret=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 do
@@ -210,8 +174,7 @@ echo "I: Shutting down slave"
 
 (cd ..; sh stop.sh rrsetorder ns2 )
 
-n=`expr $n + 1`
-echo "I: Checking for slave's on disk copy of zone ($n)"
+echo "I: Checking for slave's on disk copy of zone"
 
 if [ ! -f ns2/root.bk ]
 then
@@ -226,67 +189,47 @@ echo "I: Re-starting slave"
 #
 #
 #
-n=`expr $n + 1`
 if $test_fixed; then
-    echo "I: Checking order fixed (slave loaded from disk) ($n)"
+    echo "I: Checking order fixed (slave loaded from disk)"
+    ret=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
-    ret=0
     $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
-	    -p 5300 @10.53.0.2 fixed.example > dig.out.test$n || ret=1
-    cmp -s dig.out.test$n dig.out.fixed.good || ret=1
-    [ $ret = 0 ] && break
-    sleep 1
+	    -p 5300 @10.53.0.2 fixed.example > dig.out.fixed || ret=1
+    cmp -s dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
-else
-    echo "I: Skipped: Checking order fixed (slave loaded from disk) ($n)"
-
 fi
 
 #
 #
 #
-n=`expr $n + 1`
-echo "I: Checking order cyclic (slave loaded from disk) ($n)"
+echo "I: Checking order cyclic (slave loaded from disk)"
 ret=0
-for i in 1 2 3 4
+matches=0
+for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-	eval match$i=0
+    j=`expr $i % 4`
+    $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
+	    -p 5300 @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1
+    if [ $i -le 4 ]; then
+        cp dig.out.cyclic dig.out.$j
+    else
+        cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
+    fi
 done
-for i in a b c d e f g h
-do
-$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
-	-p 5300 @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1
-	match=0
-	for j in 1 2 3 4
-	do
-		if $test_fixed; then
-			cmp -s dig.out.cyclic dig.out.cyclic.fixed$j && {
-				eval "match$j=1 match=1";
-			}
-		else
-			cmp -s dig.out.cyclic dig.out.cyclic.good$j && {
-				eval "match$j=1 match=1";
-			}
-		fi
-		if [ $match -eq 1 ]; then break; fi
-	done
-	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; fi
-done
-match=0
-for i in 1 2 3 4
-do
-	eval "match=\`expr \$match + \$match$i\`"
-done
-echo "I: Cyclic selection return $match of 4 possible orders in 8 samples"
-if [ $match -ne 4 ]; then echo ret=1; fi
+cmp -s dig.out.0 dig.out.1 && ret=1
+cmp -s dig.out.0 dig.out.2 && ret=1
+cmp -s dig.out.0 dig.out.3 && ret=1
+cmp -s dig.out.1 dig.out.2 && ret=1
+cmp -s dig.out.1 dig.out.3 && ret=1
+cmp -s dig.out.2 dig.out.3 && ret=1
+if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-n=`expr $n + 1`
-echo "I: Checking order random (slave loaded from disk) ($n)"
+echo "I: Checking order random (slave loaded from disk)"
 ret=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 do
@@ -317,65 +260,47 @@ status=`expr $status + $ret`
 #
 #
 #
-n=`expr $n + 1`
 if $test_fixed; then
-    echo "I: Checking order fixed (cache) ($n)"
+    echo "I: Checking order fixed (cache)"
     ret=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
-	    -p 5300 @10.53.0.3 fixed.example > dig.out.test$n || ret=1
-    cmp -s dig.out.test$n dig.out.fixed.good || ret=1
+	    -p 5300 @10.53.0.3 fixed.example > dig.out.fixed || ret=1
+    cmp -s dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
-else
-    echo "I: Skipped: Checking order fixed (cache) ($n)"
 fi
 
 #
 #
 #
-n=`expr $n + 1`
-echo "I: Checking order cyclic (cache) ($n)"
+echo "I: Checking order cyclic (cache)"
 ret=0
-for i in 1 2 3 4
+matches=0
+for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-	eval match$i=0
+    j=`expr $i % 4`
+    $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
+	    -p 5300 @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1
+    if [ $i -le 4 ]; then
+        cp dig.out.cyclic dig.out.$j
+    else
+        cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
+    fi
 done
-for i in a b c d e f g h
-do
-$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
-	-p 5300 @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1
-	match=0
-	for j in 1 2 3 4
-	do
-		if $test_fixed; then
-			cmp -s dig.out.cyclic dig.out.cyclic.fixed$j && {
-				eval "match$j=1 match=1";
-			}
-		else
-			cmp -s dig.out.cyclic dig.out.cyclic.good$j && {
-				eval "match$j=1 match=1";
-			}
-		fi
-		if [ $match -eq 1 ]; then break; fi
-	done
-	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; fi
-done
-match=0
-for i in 1 2 3 4
-do
-	eval "match=\`expr \$match + \$match$i\`"
-done
-echo "I: Cyclic selection return $match of 4 possible orders in 8 samples"
-if [ $match -ne 4 ]; then echo ret=1; fi
+cmp -s dig.out.0 dig.out.1 && ret=1
+cmp -s dig.out.0 dig.out.2 && ret=1
+cmp -s dig.out.0 dig.out.3 && ret=1
+cmp -s dig.out.1 dig.out.2 && ret=1
+cmp -s dig.out.1 dig.out.3 && ret=1
+cmp -s dig.out.2 dig.out.3 && ret=1
+if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
-n=`expr $n + 1`
 
-n=`expr $n + 1`
-echo "I: Checking order random (cache) ($n)"
+echo "I: Checking order random (cache)"
 ret=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 do

doc/private/SRCID

@@ -1,6 +1,6 @@
-# $Id: SRCID,v 1.1115 2011/12/24 00:16:43 tbox Exp $
+# $Id: SRCID,v 1.1109 2011/12/22 13:17:09 tbox Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
-SRCID="( $Date: 2011/12/24 00:16:43 $ )"
+SRCID="( $Date: 2011/12/22 13:17:09 $ )"

lib/dns/rbtdb.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.324 2011/12/22 23:43:52 marka Exp $ */
+/* $Id: rbtdb.c,v 1.323 2011/12/07 22:21:05 marka Exp $ */
 
 /*! \file */
 
@@ -2744,14 +2744,6 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) {
 	return (result);
 }
 
-static inline unsigned int
-prand(isc_uint32_t val) {
-	val ^= val >> 16;
-	val ^= val >> 8;
-	val ^= val >> 4;
-	return (val & 0xf);
-}
-
 static inline void
 bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
 	      rdatasetheader_t *header, isc_stdtime_t now,
@@ -2791,8 +2783,6 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
 	raw = (unsigned char *)header + sizeof(*header);
 	rdataset->private3 = raw;
 	rdataset->count = header->count++;
-	/* Add a weak pseudo random value [0..15]. */
-	header->count += prand(header->count);
 	if (rdataset->count == ISC_UINT32_MAX)
 		rdataset->count = 0;
 

lib/dns/zone.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.659 2011/12/22 23:46:20 tbox Exp $ */
+/* $Id: zone.c,v 1.658 2011/12/22 07:32:41 each Exp $ */
 
 /*! \file */
 
@@ -3573,7 +3573,7 @@ maybe_send_secure(dns_zone_t *zone) {
 						       serial);
 		} else
 			zone_send_securedb(zone->raw, ISC_TRUE, zone->raw->db);
-
+	
 	} else
 		DNS_ZONE_SETFLAG(zone->raw, DNS_ZONEFLG_SENDSECURE);
 
@@ -12188,45 +12188,45 @@ sync_secure_journal(dns_zone_t *zone, dns_journal_t *journal,
 		    isc_uint32_t start, isc_uint32_t end,
 		    dns_difftuple_t **soatuplep, dns_diff_t *diff)
 {
-	isc_result_t result;
-	dns_difftuple_t *tuple = NULL;
+ 	isc_result_t result;
+ 	dns_difftuple_t *tuple = NULL;
 	dns_diffop_t op = DNS_DIFFOP_ADD;
 	int n_soa = 0;
 
 	REQUIRE(soatuplep != NULL);
 
-	if (start == end)
+ 	if (start == end)
 		return (DNS_R_UNCHANGED);
 
 	CHECK(dns_journal_iter_init(journal, start, end));
 	for (result = dns_journal_first_rr(journal);
-	     result == ISC_R_SUCCESS;
+ 	     result == ISC_R_SUCCESS;
 	     result = dns_journal_next_rr(journal))
 	{
-		dns_name_t *name = NULL;
-		isc_uint32_t ttl;
-		dns_rdata_t *rdata = NULL;
+ 		dns_name_t *name = NULL;
+ 		isc_uint32_t ttl;
+ 		dns_rdata_t *rdata = NULL;
 		dns_journal_current_rr(journal, &name, &ttl, &rdata);
-
-		if (rdata->type == dns_rdatatype_soa) {
-			n_soa++;
-			if (n_soa == 2) {
-				/*
+ 
+ 		if (rdata->type == dns_rdatatype_soa) {
+ 			n_soa++;
+ 			if (n_soa == 2) {
+ 				/*
 				 * Save the latest raw SOA record.
-				 */
-				if (*soatuplep != NULL)
-					dns_difftuple_free(soatuplep);
+ 				 */
+ 				if (*soatuplep != NULL)
+ 					dns_difftuple_free(soatuplep);
 				CHECK(dns_difftuple_create(diff->mctx,
-							   DNS_DIFFOP_ADD,
-							   name, ttl, rdata,
-							   soatuplep));
-			}
-			if (n_soa == 3)
-				n_soa = 1;
+ 							   DNS_DIFFOP_ADD,
+ 							   name, ttl, rdata,
+ 							   soatuplep));
+ 			}
+ 			if (n_soa == 3)
+ 				n_soa = 1;
 			continue;
 		}
 
-		/* Sanity. */
+ 		/* Sanity. */
 		if (n_soa == 0) {
 			dns_zone_log(zone->raw, ISC_LOG_ERROR,
 				     "corrupt journal file: '%s'\n",
@@ -12251,8 +12251,8 @@ sync_secure_journal(dns_zone_t *zone, dns_journal_t *journal,
 					   &tuple));
 		dns_diff_appendminimal(diff, &tuple);
 	}
-	if (result == ISC_R_NOMORE)
-		result = ISC_R_SUCCESS;
+ 	if (result == ISC_R_NOMORE)
+ 		result = ISC_R_SUCCESS;
 
  failure:
 	return(result);

util/copyrights

@@ -1202,15 +1202,7 @@
 ./bin/tests/system/rpz/test4			X	2011
 ./bin/tests/system/rpz/test5			X	2011
 ./bin/tests/system/rpz/tests.sh			SH	2011
-./bin/tests/system/rrsetorder/clean.sh		SH	2006,2007,2008,2011
-./bin/tests/system/rrsetorder/dig.out.cyclic.fixed1	X	2011
-./bin/tests/system/rrsetorder/dig.out.cyclic.fixed2	X	2011
-./bin/tests/system/rrsetorder/dig.out.cyclic.fixed3	X	2011
-./bin/tests/system/rrsetorder/dig.out.cyclic.fixed4	X	2011
-./bin/tests/system/rrsetorder/dig.out.cyclic.good1	X	2011
-./bin/tests/system/rrsetorder/dig.out.cyclic.good2	X	2011
-./bin/tests/system/rrsetorder/dig.out.cyclic.good3	X	2011
-./bin/tests/system/rrsetorder/dig.out.cyclic.good4	X	2011
+./bin/tests/system/rrsetorder/clean.sh		SH	2006,2007,2008
 ./bin/tests/system/rrsetorder/dig.out.fixed.good	X	2006
 ./bin/tests/system/rrsetorder/dig.out.random.good1	X	2006
 ./bin/tests/system/rrsetorder/dig.out.random.good10	X	2006
@@ -1240,7 +1232,7 @@
 ./bin/tests/system/rrsetorder/ns1/root.db	ZONE	2006,2007
 ./bin/tests/system/rrsetorder/ns2/named.conf	CONF-C	2006,2007
 ./bin/tests/system/rrsetorder/ns3/named.conf	CONF-C	2006,2007
-./bin/tests/system/rrsetorder/tests.sh		SH	2006,2007,2008,2011
+./bin/tests/system/rrsetorder/tests.sh		SH	2006,2007,2008
 ./bin/tests/system/run.sh			SH	2000,2001,2004,2007,2010
 ./bin/tests/system/runall.sh			SH	2000,2001,2004,2007,2010,2011
 ./bin/tests/system/send.pl			PERL	2001,2004,2007,2011