[Bug 1002] ntp-keygen option and documentation updates

bk: 52e766d9qEYuibJtkkXD-Rr7z-CsHQ

diff --git a/ChangeLog b/ChangeLog
index e7222b407b790001d07dd2fb40433c53b42adf72..945872d32299e73082e7263d7643552a4826c953 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 * [Bug 792] TrueTime TL-3 WWV refclock support.
 * [Bug 898] Documentation fixes.
 * [Bug 930] ntpdc docs refer to 'clockinfo', but mean 'clockstat'.
+* [Bug 1002] ntp-keygen option and documentation updates: -p/--pvt-passwd
+  is now -p/--password, and -q/--get-pvt-passwd is now -q/--export-passwd.
 * [Bug 2545] Cleanup of scripts/monitoring/ntptrap.
 (4.2.7p413) 2014/01/27 Released by Harlan Stenn <stenn@ntp.org>
 * Require a version string for perl scripts that use autogen.

diff --git a/util/ntp-keygen-opts.def b/util/ntp-keygen-opts.def
index d377b90a67e4ad221ccaac86c5bc8f68c6ee0446..a3959b8ebc218f4802e4c83b3906b50f86c4e5f9 100644 (file)
--- a/util/ntp-keygen-opts.def
+++ b/util/ntp-keygen-opts.def
@@ -174,26 +174,33 @@ flag = {
 
 flag = {
     value     = p;
-    name      = pvt-passwd;
+    name      = password;      // was: pvt-passwd;
     ifdef     = AUTOKEY;
     arg-type  = string;
     arg-name  = passwd;
-    descrip   = "output private password";
+    descrip   = "local private password";
     doc = <<-  _EndOfDoc_
-       Encrypt generated files containing private data with the specified
-       password and the cipher selected with @code{-C/--cipher}.
+       Local files containing private data are encrypted with the
+       DES-CBC algorithm and the specified password.  The same password
+       must be specified to the local ntpd via the "crypto pw password"
+       configuration command.  The default password is the local
+       hostname.
        _EndOfDoc_;
 };
 
 flag = {
     value     = q;
-    name      = get-pvt-passwd;
+    name      = export-passwd; // Was: get-pvt-passwd;
     ifdef     = AUTOKEY;
     arg-type  = string;
     arg-name  = passwd;
-    descrip   = "input private password";
+    descrip   = "export IFF or GQ group keys with password";
     doc = <<-  _EndOfDoc_
-       Set the password for reading files to the specified password.
+       Export IFF or GQ identity group keys to the standard output,
+       encrypted with the DES-CBC algorithm and the specified password.
+       The same password must be specified to the remote ntpd via the
+       "crypto pw password" configuration command.  See also the option
+       --id-key (-e) for unencrypted exports.
        _EndOfDoc_;
 };