3200. [doc] Some rndc functions were undocumented or were

			missing from 'rndc -h' output. [RT #25555]

diff --git a/CHANGES b/CHANGES
index 92d159917b0ed7ac68c666aff136f5c56104c895..a5ff54b50ec1d136ec5f79bde4bec975f1e3af08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3200.  [doc]           Some rndc functions were undocumented or were
+                       missing from 'rndc -h' output. [RT #25555]
+
 3196.   [bug]           nsupdate: return nonzero exit code when target zone
                         doesn't exist. [RT #25783]
 

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 6815144dde64717686472f9b2bd79cdd68f784fb..7372559cde3bf97ac90e1b017830fdfd2e8a18e2 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.122.44.5 2011/08/30 12:23:16 marka Exp $ */
+/* $Id: rndc.c,v 1.122.44.6 2011/11/03 22:06:50 each Exp $ */
 
 /*! \file */
 
@@ -135,6 +135,10 @@ command is one of the following:\n\
                Flush the given name from the server's cache(s)\n\
   status       Display status of the server.\n\
   recursing    Dump the queries that are currently recursing (named.recursing)\n\
+  tsig-list    List all currently active TSIG keys, including both statically\n\
+               configured and TKEY-negotiated keys.\n\
+  tsig-delete keyname [view]\n\
+               Delete a TKEY-negotiated TSIG key.\n\
   validation newstate [view]\n\
                Enable / disable DNSSEC validation.\n\
   *restart     Restart the server.\n\

diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh
index 7d64de5c9bba8231d92cc4ed5427a520ecf72ece..c03147096af1d261c0ae54300c4018691f33bd6f 100644 (file)
--- a/bin/tests/system/tkey/clean.sh
+++ b/bin/tests/system/tkey/clean.sh
@@ -15,8 +15,9 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
+# $Id: clean.sh,v 1.6.250.1 2011/11/03 22:06:50 each Exp $
 
 rm -f dig.out.* random.data ns1/named.conf
 rm -f K* ns1/K*
 rm -f */named.memstats
+rm -f rndc.out

diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in
index 6bb0d7f9cfe76b4f42a61e7f73e6d04d22caeb0f..067099a9a2869566574766de34152380a1cba89e 100644 (file)
--- a/bin/tests/system/tkey/ns1/named.conf.in
+++ b/bin/tests/system/tkey/ns1/named.conf.in
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf.in,v 1.6.332.2 2009/01/30 23:47:18 tbox Exp $ */
+/* $Id: named.conf.in,v 1.6.332.3 2011/11/03 22:06:50 each Exp $ */
 
 controls { /* empty */ };
 
@@ -34,6 +34,15 @@ options {
        allow-query-cache { any; };
 };
 
+key rndc_key {
+        secret "1234abcd8765";
+        algorithm hmac-md5;
+};
+
+controls {
+        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+};
+
 key "tkeytest." {
        algorithm hmac-md5;
        secret "0123456789ab";

diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh
index 199a3b9dae29ba238bbef3317c9a09c26540cfc0..0af9ee56f0823217f038f22263d56e0540584885 100644 (file)
--- a/bin/tests/system/tkey/tests.sh
+++ b/bin/tests/system/tkey/tests.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.7 2007/06/19 23:47:06 tbox Exp $
+# $Id: tests.sh,v 1.7.332.1 2011/11/03 22:06:50 each Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -79,5 +79,34 @@ do
        status=`expr $status + $ret`
 done
 
+echo "I:creating new key using owner name bar.example."
+ret=0
+keyname=`./keycreate $dhkeyname bar.example.` || ret=1
+if [ $ret != 0 ]; then
+        echo "I:failed"
+        echo "I:exit status: $status"
+        exit $status
+fi
+status=`expr $status + $ret`
+
+echo "I:checking the key with 'rndc tsig-list'"
+ret=0
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list > rndc.out
+grep "key \"bar.example.server" rndc.out > /dev/null || ret=1
+if [ $ret != 0 ]; then
+        echo "I:failed"
+fi
+status=`expr $status + $ret`
+
+echo "I:deleting the key with 'rndc tsig-delete'"
+ret=0
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-delete bar.example.server > /dev/null || ret=1
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list > rndc.out
+grep "key \"bar.example.server" rndc.out > /dev/null && ret=1
+if [ $ret != 0 ]; then
+        echo "I:failed"
+fi
+status=`expr $status + $ret`
+
 echo "I:exit status: $status"
 exit $status

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index bfa2c49b89d40fe33285b04d644728bd6a57a092..a7c611a5caea8f6cdd00e02b5c926563d1c9875b 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.380.14.35 2011/11/03 04:56:00 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.380.14.36 2011/11/03 22:06:50 each Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -1360,7 +1360,32 @@ zone "eng.example.com" {
                   </varlistentry>
 
                   <varlistentry>
-                    <term><userinput>recursing</userinput></term>
+                   <term><userinput>tsig-list</userinput></term>
+                   <listitem>
+                     <para>
+                       List the names of all TSIG keys currently configured
+                       for use by <command>named</command> in each view.  The
+                       list both statically configured keys and dynamic
+                       TKEY-negotiated keys.
+                     </para>
+                   </listitem>
+                 </varlistentry>
+
+                 <varlistentry>
+                  <term><userinput>tsig-delete</userinput>
+                    <replaceable>keyname</replaceable>
+                    <optional><replaceable>view</replaceable></optional></term>
+                   <listitem>
+                     <para>
+                       Delete a given TKEY-negotated key from the server.
+                       (This does not apply to statically configured TSIG
+                       keys.)
+                     </para>
+                   </listitem>
+                 </varlistentry>
+
+                 <varlistentry>
+                   <term><userinput>recursing</userinput></term>
                     <listitem>
                       <para>
                         Dump the list of queries <command>named</command> is currently recursing