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

bk: 45beab58_MBM_w5dG8tT29d-xGCedg

diff --git a/ChangeLog b/ChangeLog
index b2e21ccf48e945b75b762347e00cd2c49c58f354..b5da3aaf5c91df8fab73823e69e5c27a78071aac 100644 (file)
--- 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 ed7b35328c623bd0312e7fdfb072da1deba6cbc5..6c1451889551944d2d97db051301f821aa4dab76 100644 (file)
--- 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