From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 18 Mar 2002 06:18:31 +0000 (-0500)
Subject: ntp-genkeys improvements.
X-Git-Tag: NTP_4_1_73~173^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=633efd81b9b3e9bb3b1fdfd1ff5fbdc03404f325;p=thirdparty%2Fntp.git

ntp-genkeys improvements.

bk: 3c9586b7BkvXRBDUMxBSVzrLPGen5g
---

diff --git a/util/ntp-genkeys.c b/util/ntp-genkeys.c
index f767586250..da024d2e01 100644
--- a/util/ntp-genkeys.c
+++ b/util/ntp-genkeys.c
@@ -752,7 +752,7 @@ genkeys(
 		}
 	}
 	if (!gotsignkey && *f1_signkey)	{ /* Use sign key from ntp.conf */
-		cp = getpath(keysdir, f1_signkey, f2_signkey);
+		cp = getpath(keysdir, f1_signkey, NULL);
 		if (!cp)
 			exit(-1);
 		strcpy(f3_signkey, cp);
@@ -785,7 +785,7 @@ genkeys(
 		}
 	}
 	if (!gotsignkey && *f1_privatekey) { /* Use rsakey from ntp.conf */
-		cp = getpath(keysdir, f1_privatekey, f2_privatekey);
+		cp = getpath(keysdir, f1_privatekey, NULL);
 		if (!cp)
 			exit(-1);
 		strcpy(f3_signkey, cp);
@@ -797,6 +797,9 @@ genkeys(
 		if (debug > 1)
 			printf("f3: DR: <%s>\n", f3_signkey);
 	}
+
+	if (!gotsignkey)
+		printf("No key found - no certs can be generated.\n");
 #endif /* OPENSSL */
 
 	return (0);