clarify "rndc sync" logging, add it to "rndc -h" output, per francis

review comments in rt22473.

diff --git a/bin/named/server.c b/bin/named/server.c
index d6042dfa353edb6f79a0148ad86de63eed27e470..ba6afb8d087b40132e9c058f6478b05f6eb1f346 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.609 2011/03/21 07:22:11 each Exp $ */
+/* $Id: server.c,v 1.610 2011/03/21 15:39:05 each Exp $ */
 
 /*! \file */
 
@@ -7073,7 +7073,7 @@ ns_server_sync(ns_server_t *server, char *args, isc_buffer_t *text) {
                        zonename, sizeof(zonename));
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
                      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
-                     "dumping zone '%s/%s'%s%s%s: %s",
+                     "sync: dumping zone '%s/%s'%s%s%s: %s",
                      zonename, classstr, sep, vname,
                      cleanup ? ", removing journal file" : "",
                      isc_result_totext(result));

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index c04cecb8ceef3677c7e909c158d9e3e4ddab9c7f..668d2ca801b76bcf14fc2898c6dec3fabd30572f 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.133 2011/02/03 12:18:10 tbox Exp $ */
+/* $Id: rndc.c,v 1.134 2011/03/21 15:39:05 each Exp $ */
 
 /*! \file */
 
@@ -114,6 +114,11 @@ command is one of the following:\n\
   thaw         Enable updates to all dynamic zones and reload them.\n\
   thaw zone [class [view]]\n\
                Enable updates to a frozen dynamic zone and reload it.\n\
+  sync [-clear]        Dump changes to all dynamic zones to disk, and optionally\n\
+               remove their journal files.\n\
+  sync [-clear] zone [class [view]]\n\
+               Dump a single zone's changes to disk, and optionally\n\
+               remove its journal file.\n\
   notify zone [class [view]]\n\
                Resend NOTIFY messages for the zone.\n\
   reconfig     Reload configuration file and new zones only.\n\