From: johnd <johnd>
Date: Fri, 10 Dec 2010 19:20:47 +0000 (+0000)
Subject: Include "loadkeys" in rndc help output. [RT #22493]
X-Git-Tag: v9.8.1~172
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7659fdb3aab0a96e10aac67669b6c8d79faef44f;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index fff4c0882fe..6a3e9b8ded3 100644
--- 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 6a23caa9a23..b42f3122149 100644
--- 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\