This commit was generated by cvs2svn to compensate for changes in r135601,

which included commits to RCS files with non-trunk default branches.

6 files changed, 35 insertions, 8 deletions

diff --git a/contrib/bind9/CHANGES b/contrib/bind9/CHANGES
index ac7f212853fa..aea126caaa5a 100644
--- a/contrib/bind9/CHANGES
+++ b/contrib/bind9/CHANGES
@@ -1,4 +1,8 @@
 
+	--- 9.3.0 released ---
+
+1711.	[func]		'rndc unfreeze' has been deprecated by 'rndc thaw'.
+
 	--- 9.3.0rc4 released ---
 
 1709.	[port]		solaris: add SMF support.
diff --git a/contrib/bind9/KNOWN_DEFECTS b/contrib/bind9/KNOWN_DEFECTS
new file mode 100644
index 000000000000..53d9ceb5ff28
--- /dev/null
+++ b/contrib/bind9/KNOWN_DEFECTS
@@ -0,0 +1,21 @@
+
+		Known Defects in BIND 9.3.0
+
+* 'dig +chase' does not terminate on a RFC 2308 Type 1 negative response.
+
+* named does not correctly caching a RFC 2308 Type 1 negative response.
+  This causes named to emit RFC 2308 Type 3 responses instead of RFC 2308
+  Type 2 responses which inturn causes problems for nsupdate (below).
+
+* nsupdate does not handling RFC 2308 Type 3 negative responses when looking
+  for the zone / master server.  Use server and zone commands to work around
+  this.
+
+* "ifconfig.sh down" doesn't work for Solaris 9.
+
+* named.conf(5) is being installed in the wrong location.
+
+* dig/host/nslookup are only trying the first address when a nameserver was
+  specified by name.
+
+* Missing FULLCHECK for "trusted-key" in dig.
diff --git a/contrib/bind9/bin/named/control.c b/contrib/bind9/bin/named/control.c
index 89e36bd458c5..8eb75332f39f 100644
--- a/contrib/bind9/bin/named/control.c
+++ b/contrib/bind9/bin/named/control.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.c,v 1.7.2.2.2.10 2004/03/22 01:52:22 marka Exp $ */
+/* $Id: control.c,v 1.7.2.2.2.10.4.1 2004/09/20 01:00:00 marka Exp $ */
 
 #include <config.h>
 
@@ -122,7 +122,8 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
 		result = ns_server_status(ns_g_server, text);
 	} else if (command_compare(command, NS_COMMAND_FREEZE)) {
 		result = ns_server_freeze(ns_g_server, ISC_TRUE, command);
-	} else if (command_compare(command, NS_COMMAND_UNFREEZE)) {
+	} else if (command_compare(command, NS_COMMAND_UNFREEZE) ||
+		   command_compare(command, NS_COMMAND_THAW)) {
 		result = ns_server_freeze(ns_g_server, ISC_FALSE, command);
 	} else if (command_compare(command, NS_COMMAND_RECURSING)) {
 		result = ns_server_dumprecursing(ns_g_server);
diff --git a/contrib/bind9/bin/named/include/named/control.h b/contrib/bind9/bin/named/include/named/control.h
index b8d95d8bd2b0..9cf4a33f7301 100644
--- a/contrib/bind9/bin/named/include/named/control.h
+++ b/contrib/bind9/bin/named/include/named/control.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.h,v 1.6.2.2.2.6 2004/03/08 04:04:20 marka Exp $ */
+/* $Id: control.h,v 1.6.2.2.2.6.6.1 2004/09/20 01:00:01 marka Exp $ */
 
 #ifndef NAMED_CONTROL_H
 #define NAMED_CONTROL_H 1
@@ -47,6 +47,7 @@
 #define NS_COMMAND_STATUS	"status"
 #define NS_COMMAND_FREEZE	"freeze"
 #define NS_COMMAND_UNFREEZE	"unfreeze"
+#define NS_COMMAND_THAW		"thaw"
 #define NS_COMMAND_RECURSING	"recursing"
 #define NS_COMMAND_NULL		"null"
 
diff --git a/contrib/bind9/bin/rndc/rndc.c b/contrib/bind9/bin/rndc/rndc.c
index 9ea07ac00eb3..89ca1df66c04 100644
--- a/contrib/bind9/bin/rndc/rndc.c
+++ b/contrib/bind9/bin/rndc/rndc.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.77.2.5.2.12 2004/03/08 04:04:23 marka Exp $ */
+/* $Id: rndc.c,v 1.77.2.5.2.12.6.1 2004/09/20 01:00:01 marka Exp $ */
 
 /*
  * Principal Author: DCL
@@ -99,7 +99,7 @@ command is one of the following:\n\
 		Retransfer a single zone without checking serial number.\n\
   freeze zone [class [view]]\n\
   		Suspend updates to a dynamic zone.\n\
-  unfreeze zone [class [view]]\n\
+  thaw zone [class [view]]\n\
   		Enable updates to a frozen dynamic zone and reload it.\n\
   reconfig	Reload configuration file and new zones only.\n\
   stats		Write server statistics to the statistics file.\n\
diff --git a/contrib/bind9/version b/contrib/bind9/version
index 153edf9c4742..efea20806f73 100644
--- a/contrib/bind9/version
+++ b/contrib/bind9/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.26.2.17.2.10 2004/09/01 07:29:40 marka Exp $
+# $Id: version,v 1.26.2.17.2.10.4.1 2004/09/20 01:01:01 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=3
 PATCHVER=0
-RELEASETYPE=rc
-RELEASEVER=4
+RELEASETYPE=
+RELEASEVER=