From fc39b6a96109b78154ec148d20eaf29e8abc14b6 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Tue, 21 Jul 2015 12:24:27 +0530 Subject: [PATCH] Update rndc usage output (#40010) Squashed commit of the following: commit 73f0bba7d8d4763763ff88731c739ac646714ac8 Author: Mukund Sivaraman Date: Mon Jul 13 05:40:35 2015 +0530 Update rndc usage output This is based on a patch sent by Tony Finch. --- CHANGES | 4 ++++ bin/rndc/rndc.c | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index bf9c49720a..93572a4264 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4157. [func] Update rndc's usage output to include recently added + commands. Thanks to Tony Finch for submitting a + patch. [RT #40010] + 4156. [func] Print informative output from rndc showzone when allow-new-zones is not enabled for a view. Thanks to Tony Finch for submitting a patch. [RT #40009] diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index fb8c72927b..0636a145b6 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -104,9 +104,9 @@ Usage: %s [-b address] [-c config] [-s server] [-p port]\n\ command is one of the following:\n\ \n\ addzone zone [class [view]] { zone-options }\n\ - Add zone to given view. Requires new-zone-file option.\n\ + Add zone to given view. Requires allow-new-zones option.\n\ delzone [-clean] zone [class [view]]\n\ - Removes zone from given view. Requires new-zone-file option.\n\ + Removes zone from given view.\n\ dumpdb [-all|-cache|-zones|-adb|-bad|-fail] [view ...]\n\ Dump cache(s) to the dump file (named_dump.db).\n\ flush Flushes all of the server's caches.\n\ @@ -129,6 +129,9 @@ command is one of the following:\n\ Display RFC 5011 managed keys information\n\ managed-keys sync [class [view]]\n\ Write RFC 5011 managed keys to disk\n\ + modzone zone [class [view]] { zone-options }\n\ + Modify a zone's configuration.\n\ + Requires allow-new-zones option.\n\ notify zone [class [view]]\n\ Resend NOTIFY messages for the zone.\n\ notrace Set debugging level to 0.\n\ @@ -158,6 +161,8 @@ command is one of the following:\n\ scan Scan available network interfaces for changes.\n\ secroots [view ...]\n\ Write security roots to the secroots file.\n\ + showzone zone [class [view]]\n\ + Print a zone's configuration.\n\ sign zone [class [view]]\n\ Update zone keys, and sign as needed.\n\ signing -clear all zone [class [view]]\n\