Include "loadkeys" in rndc help output. [RT #22493]

diff --git a/CHANGES b/CHANGES
index fff4c0882fe4e056d0f31ca9b96d5a77373e7592..6a3e9b8ded3fde9d5b3efa82d62827e43817ca43 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
        --- 9.8.0a1 released ---
 
+2983.  [bug]           Include "loadkeys" in rndc help output. [RT #22493]
+
 2982.  [bug]           Reference count dst keys.  dst_key_attach() can be used
                        increment the reference count.
 

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 6a23caa9a233643ffcc0e3dfe9afdcdecaccf965..b42f3122149b73761e73f26207ccb4da07276e95 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.130 2010/07/11 00:12:57 each Exp $ */
+/* $Id: rndc.c,v 1.131 2010/12/10 19:20:47 johnd Exp $ */
 
 /*! \file */
 
@@ -119,6 +119,8 @@ command is one of the following:\n\
   reconfig     Reload configuration file and new zones only.\n\
   sign zone [class [view]]\n\
                Update zone keys, and sign as needed.\n\
+  loadkeys zone [class [view]]\n\
+               Update keys without signing immediately.\n\
   stats                Write server statistics to the statistics file.\n\
   querylog     Toggle query logging.\n\
   dumpdb [-all|-cache|-zones] [view ...]\n\