[Bug 940] ntp-keygen uses -v. Disallow it as a shortcut for --version

bk: 471d50b5gkmhHE75teXMIliGe6eMvA

diff --git a/ChangeLog b/ChangeLog
index c283e18a217f399ce45e67b0fcf0cc16f358a88c..ab21062cd62b1625bf78998cc83e408eed249c91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 940] ntp-keygen uses -v.  Disallow it as a shortcut for --version.
 * more cleanup to ntp_lineeditlibs.m4.
 * Documentation updates from Dave Mills.
 * -ledit cleanup for ntpdc and ntpq.

diff --git a/include/copyright.def b/include/copyright.def
index b2f887aaaffd62c5d22a2f06f3f628e21c182e91..4d9e671ed50c8ce4d03fc07aea0ecc5148969354 100644 (file)
--- a/include/copyright.def
+++ b/include/copyright.def
@@ -16,3 +16,5 @@ version         = `
 eval VERSION=\`sed -e 's/.*,\\[//' -e 's/\\].*//' < ../version.m4\`
 [ -z "${VERSION}" ] && echo "Cannot determine VERSION" && kill -TERM $AG_pid
 echo $VERSION`;
+
+version-value = '';    /* Don't use -v as a shortcut for --version */