From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 30 Jan 2007 02:20:08 +0000 (-0500)
Subject: [Bug 770] Fix numeric parameters to ntp-keygen (Alain Guibert).
X-Git-Tag: NTP_4_2_4_RC2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=221dc1cead0c1b2a97d4f4d142c3f056eb9a2ce1;p=thirdparty%2Fntp.git

[Bug 770] Fix numeric parameters to ntp-keygen (Alain Guibert).

bk: 45beab58_MBM_w5dG8tT29d-xGCedg
---

diff --git a/ChangeLog b/ChangeLog
index b2e21ccf4..b5da3aaf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 (4.2.4p1) Released by Harlan Stenn <stenn@ntp.org>
+* [Bug 770] Fix numeric parameters to ntp-keygen (Alain Guibert).
 * [Bug 768] Fix io_setbclient() error message.
 * [Bug 765] Use net_bind_service capability on linux.
 * [Bug 760] The background resolver must be aware of the 'dynamic' keyword.
diff --git a/util/ntp-keygen.c b/util/ntp-keygen.c
index ed7b35328..6c1451889 100644
--- a/util/ntp-keygen.c
+++ b/util/ntp-keygen.c
@@ -323,7 +323,7 @@ main(
 
 #ifdef OPENSSL
 	if (HAVE_OPT( MODULUS ))
-	    modulus = DESC(MODULUS).optOccCt;
+	    modulus = OPT_VALUE_MODULUS;
 
 	if (HAVE_OPT( PVT_CERT ))
 	    exten = EXT_KEY_PRIVATE;
@@ -345,12 +345,12 @@ main(
 
 	if (HAVE_OPT( MV_PARAMS )) {
 		mvpar++;
-		nkeys = DESC(MV_PARAMS).optOccCt;
+		nkeys = OPT_VALUE_MV_PARAMS;
 	}
 
 	if (HAVE_OPT( MV_KEYS )) {
 		mvkey++;
-		nkeys = DESC(MV_KEYS).optOccCt;
+		nkeys = OPT_VALUE_MV_KEYS;
 	}
 #endif