BIND 10 master, updated. 8ab7817d7c346d35a7be2a1d6bfe51aed4fef15c [master] Merge branch 'trac1846'

[BIND 10 source code commits]

The branch, master has been updated
       via  8ab7817d7c346d35a7be2a1d6bfe51aed4fef15c (commit)
       via  9e5da4f42072e2bee454178eb1422103504a40dc (commit)
       via  73a6349b16ce1c95ff6216fdbff9551d574988d9 (commit)
      from  78bb8f4b9676d6345f3fdd1e5cc89039806a9aba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8ab7817d7c346d35a7be2a1d6bfe51aed4fef15c
Merge: 9e5da4f 73a6349
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Mar 27 19:22:30 2012 -0700

    [master] Merge branch 'trac1846'

commit 9e5da4f42072e2bee454178eb1422103504a40dc
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Mar 27 13:42:23 2012 -0700

    [master] changelog for #1836

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                              |    6 +++
 src/bin/dbutil/dbutil.py.in            |    5 ++-
 src/bin/dbutil/tests/dbutil_test.sh.in |   58 +++++++++++++++++---------------
 3 files changed, 41 insertions(+), 28 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index c09b395..fd9b7b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+414.	[bug]		jinmei
+	b10-auth now correctly handles delegation from an unsigned zone
+	(defined in the in-memory data source) when the query has DNSSEC
+	DO bit on.  It previously returned SERVFAIL.
+	(Trac #1836, git 78bb8f4b9676d6345f3fdd1e5cc89039806a9aba)
+
 413.	[func]		stephen, jelte
 	Created a new tool b10-dbutil, that can check and upgrade database
 	schemas, to be used when incompatible changes are introduced in the
diff --git a/src/bin/dbutil/dbutil.py.in b/src/bin/dbutil/dbutil.py.in
index 81f351e..ad63d50 100755
--- a/src/bin/dbutil/dbutil.py.in
+++ b/src/bin/dbutil/dbutil.py.in
@@ -378,7 +378,10 @@ def get_latest_version():
 
     This is the 'to' version held in the last element of the upgrades list
     """
-    return UPGRADES[-1]['to']
+    # Temporarily hardcoded to return 1 as the schema version, until
+    # #324 is merged.
+    #return UPGRADES[-1]['to']
+    return (1, 0)
 
 
 def get_version(db):
diff --git a/src/bin/dbutil/tests/dbutil_test.sh.in b/src/bin/dbutil/tests/dbutil_test.sh.in
index 92c5953..2b072f9 100755
--- a/src/bin/dbutil/tests/dbutil_test.sh.in
+++ b/src/bin/dbutil/tests/dbutil_test.sh.in
@@ -359,19 +359,22 @@ check_version $testdata/old_v1.sqlite3 "V1.0"
 check_no_backup $tempfile $backupfile
 rm -f $tempfile $backupfile
 
-echo "5.2. Database is an old V1 database - upgrade"
-upgrade_ok_test $testdata/old_v1.sqlite3 $backupfile
-rm -f $tempfile $backupfile
+# Temporarily disabled until #324 is merged
+#echo "5.2. Database is an old V1 database - upgrade"
+#upgrade_ok_test $testdata/old_v1.sqlite3 $backupfile
+#rm -f $tempfile $backupfile
 
 
-echo "6.1. Database is new V1 database - check"
-check_version $testdata/new_v1.sqlite3 "V1.0"
-check_no_backup $tempfile $backupfile
-rm -f $tempfile $backupfile
+# Temporarily disabled until #324 is merged
+#echo "6.1. Database is new V1 database - check"
+#check_version $testdata/new_v1.sqlite3 "V1.0"
+#check_no_backup $tempfile $backupfile
+#rm -f $tempfile $backupfile
 
-echo "6.2. Database is a new V1 database - upgrade"
-upgrade_ok_test $testdata/new_v1.sqlite3 $backupfile
-rm -f $tempfile $backupfile
+# Temporarily disabled until #324 is merged
+#echo "6.2. Database is a new V1 database - upgrade"
+#upgrade_ok_test $testdata/new_v1.sqlite3 $backupfile
+#rm -f $tempfile $backupfile
 
 
 echo "7.1. Database is V2.0 database - check"
@@ -402,9 +405,10 @@ upgrade_fail_test $testdata/too_many_version.sqlite3 $backupfile
 rm -f $tempfile $backupfile
 
 
-echo "10.0. Upgrade corrupt database"
-upgrade_fail_test $testdata/corrupt.sqlite3 $backupfile
-rm -f $tempfile $backupfile
+# Temporarily disabled until #324 is merged
+#echo "10.0. Upgrade corrupt database"
+#upgrade_fail_test $testdata/corrupt.sqlite3 $backupfile
+#rm -f $tempfile $backupfile
 
 
 echo "11. Record count test"
@@ -443,20 +447,15 @@ copy_file $testdata/old_v1.sqlite3 $tempfile
 passzero $?
 rm -f $tempfile $backupfile
 
-echo "13.3 quiet flag"
-copy_file $testdata/old_v1.sqlite3 $tempfile
-../run_dbutil.sh --check --quiet $tempfile 2>&1 | grep .
-failzero $?
-rm -f $tempfile $backupfile
-
-echo "13.3 Interactive prompt - yes"
-copy_file $testdata/old_v1.sqlite3 $tempfile
-../run_dbutil.sh --upgrade $tempfile << .
-Yes
-.
-passzero $?
-check_version $tempfile "V2.0"
-rm -f $tempfile $backupfile
+# Temporarily disabled until #324 is merged
+#echo "13.3 Interactive prompt - yes"
+#copy_file $testdata/old_v1.sqlite3 $tempfile
+#../run_dbutil.sh --upgrade $tempfile << .
+#Yes
+#.
+#passzero $?
+#check_version $tempfile "V2.0"
+#rm -f $tempfile $backupfile
 
 echo "13.4 Interactive prompt - no"
 copy_file $testdata/old_v1.sqlite3 $tempfile
@@ -468,6 +467,11 @@ diff $testdata/old_v1.sqlite3 $tempfile > /dev/null
 passzero $?
 rm -f $tempfile $backupfile
 
+echo "13.5 quiet flag"
+copy_file $testdata/old_v1.sqlite3 $tempfile
+../run_dbutil.sh --check --quiet $tempfile 2>&1 | grep .
+failzero $?
+rm -f $tempfile $backupfile
 
 # Report the result
 if [ $failcount -eq 0 ]; then