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

diff --git a/CHANGES b/CHANGES
index a3847ee55cf36f2ac20465b2dbd400d66d787d14..7c856059a69ccd25dcf4793e7e9cea4f73b443af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-1711.  [placeholder]   rt12416
+1711.  [func]          'rndc unfreeze' has been deprecated by 'rndc thaw'.
 
 1710.  [placeholder]   rt9479
 

diff --git a/bin/named/control.c b/bin/named/control.c
index e951238bdd6bdabcc6f1539b1115c0b578385264..f61bb957e746ca1812fc260dd5a7ea7b44f54430 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.20 2004/03/22 01:46:00 marka Exp $ */
+/* $Id: control.c,v 1.21 2004/09/03 03:42:58 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 7a271d29f039f8946abbe8853efae1de3ca4fbb6..1c9a8131733863b09e91536e6ccfdaa464a2aa8d 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.14 2004/03/05 04:57:55 marka Exp $ */
+/* $Id: control.h,v 1.15 2004/09/03 03:42:58 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_TIMERPOKE   "timerpoke"
 #define NS_COMMAND_RECURSING   "recursing"
 #define NS_COMMAND_NULL                "null"

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 38f24efa8f9bf5732e16330af9253f1c0001a8b5..0430148d5ca37a0400b4f28a5368c9fe6a7b4040 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.98 2004/07/23 04:15:23 marka Exp $ */
+/* $Id: rndc.c,v 1.99 2004/09/03 03:42:58 marka Exp $ */
 
 /*
  * Principal Author: DCL
@@ -102,7 +102,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\