1711. [func] 'rndc unfreeze' has been deprecated by 'rndc thaw'.

diff --git a/CHANGES b/CHANGES
index ac7f212853fae1f25a9195cbfee05151d6c4ef34..a58da1f9abce913077f9a8abf5f139d25e88182b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 
+1711.  [func]          'rndc unfreeze' has been deprecated by 'rndc thaw'.
+
        --- 9.3.0rc4 released ---
 
 1709.  [port]          solaris: add SMF support.

diff --git a/bin/named/control.c b/bin/named/control.c
index 89e36bd458c5a47cfac426c574478dd3a0467aee..8eb75332f39f35c2c1a549914c5ce920736880f8 100644 (file)
--- a/bin/named/control.c
+++ b/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/bin/named/include/named/control.h b/bin/named/include/named/control.h
index b8d95d8bd2b05ed062ece45a1ce1515250aa04a8..9cf4a33f7301f5dbeb574983c7afb890d0e65ea7 100644 (file)
--- a/bin/named/include/named/control.h
+++ b/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/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 9ea07ac00eb34e2fa0ae98e0c8b9f5ae2022f8b3..89ca1df66c0489ee60f5f9627d3bff6b32cd0e65 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/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\