ChangeLog, ntp_crypto.c, ntp-genkeys.c:

  * ntpd/ntp_crypto.c (crypto_rsa): Now that we're using
  NTP_KEYSDIR, make sure there is a '/ between the dir and the file.
  * util/ntp-genkeys.c (main): More small steps...

bk: 39973032hps-qzsWyavcIM0b58gKNg

diff --git a/ChangeLog b/ChangeLog
index 6ef0d1f08349652225784546d928b6fda963d011..cd7f059b7ff96b25a3f05f9cf2f21641e4b1b29f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-13  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * ntpd/ntp_crypto.c (crypto_rsa): Now that we're using
+       NTP_KEYSDIR, make sure there is a '/ between the dir and the file.
+
        * util/ntp-genkeys.c (main): More small steps...
 
 2000-08-12  Harlan Stenn  <stenn@whimsy.udel.edu>

diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 466a1dc08e9d28af7a2c793aa8a68b01712a46a4..b98e8b087f134c2188990d7e92ba07ade3411924 100644 (file)
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -1312,7 +1312,7 @@ crypto_rsa(
        if (*cp == '/')
                strcpy(filename, cp);
        else
-               snprintf(filename, MAXFILENAME, "%s%s", keysdir, cp);
+               snprintf(filename, MAXFILENAME, "%s/%s", keysdir, cp);
        str = fopen(filename, "r");
        if (str == NULL) {
                msyslog(LOG_ERR, "crypto: RSA file %s not found",
@@ -1419,7 +1419,7 @@ crypto_dh(
        if (*cp == '/')
                strcpy(filename, cp);
        else
-               snprintf(filename, MAXFILENAME, "%s%s", keysdir, cp);
+               snprintf(filename, MAXFILENAME, "%s/%s", keysdir, cp);
        str = fopen(filename, "r");
        if (str == NULL) {
                msyslog(LOG_INFO,
@@ -1564,7 +1564,7 @@ crypto_tai(
        if (*cp == '/')
                strcpy(filename, cp);
        else
-               snprintf(filename, MAXFILENAME, "%s%s", keysdir, cp);
+               snprintf(filename, MAXFILENAME, "%s/%s", keysdir, cp);
        str = fopen(filename, "r");
        if (str == NULL) {
                msyslog(LOG_INFO,

diff --git a/util/ntp-genkeys.c b/util/ntp-genkeys.c
index 2b862fa6be4ee8fc0bc53371fcc02756f220c999..5cd30fcd1a205552aba7972bf0d0a38f7f1ac983 100644 (file)
--- a/util/ntp-genkeys.c
+++ b/util/ntp-genkeys.c
@@ -505,12 +505,15 @@ newfile(
           If:
           - no symlink support, or
           - there is no old symlink (!f3)
-          - - base = dirname(f1)
+          - - file = dirname(f1) / f2
           Otherwise:
           - If ('/' == *f3)
-          - - base = dirname(f3)
+          - - file = dirname(f3) / f2
           - else
-          - - base = dirname(f1) / dirname(f2)
+          - - file = dirname(f1) / dirname(f3) / f2
+          fopen(file)
+          print any error message/bail
+          return FILE
        */
 }