[Bug 817] Use longnames for setting ntp variables on the command-line

bk: 464a8d48iPIg3kg14tA-AqRNW_tKFA

diff --git a/ChangeLog b/ChangeLog
index 82587648c04ac46fbe2b2e351dc65b77bf4a5fd4..06db357f244ba23856ad64ef49c718fb87f8a181 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* [Bug 817] Use longnames for setting ntp variables on the command-line;
+           Allowing '-v' with and without an arg to disambiguate usage
+           is error-prone.
 * [Bug 822] set progname once, early.
 * [Bug 819] remove erroneous #if 0 in Windows completion port code.
 * The new config code missed an #ifdef for building without refclocks.

diff --git a/NEWS b/NEWS
index 22a6c24adf9978b0750ee30a569a879a45638590..c9fdc31af0ad797d956ffa308afd91ef9388f483 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Backward-Incomatible changes:
+
+ntpd no longer accepts '-v name' or '-V name' to define internal variables.
+Use '--var name' or '--dvar name' instead. (Bug 817)
+---
 NTP 4.2.4 (Harlan Stenn <stenn@ntp.org>, 2006/12/31)
 
 Focus: enhancements and bug fixes.

diff --git a/ntpd/ntpdbase-opts.def b/ntpd/ntpdbase-opts.def
index 6c80e7abd67c99add2a22dc51ccc436f87976862..a51d30e3a04e760899c76d31541df0bf0237790a 100644 (file)
--- a/ntpd/ntpdbase-opts.def
+++ b/ntpd/ntpdbase-opts.def
@@ -393,7 +393,7 @@ flag = {
 
 flag = {
     name      = var;
-    value     = v;
+/*    value     = v;   Bug 817 */
     arg-type  = string;
     descrip   = "make ARG an ntp variable (RW)";
     max       = NOLIMIT;
@@ -405,7 +405,7 @@ flag = {
 
 flag = {
     name      = dvar;
-    value     = V;
+/*    value     = V;   Bug 817 */
     arg-type  = string;
     descrip   = "make ARG an ntp variable (RW|DEF)";
     max       = NOLIMIT;