Default public key directory definition sanity.

3 files changed, 6 insertions, 6 deletions

diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index 73faeab4d31..24db827ded3 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.50 2003/04/30 15:15:11 jason Exp $	*/
+/*	$OpenBSD: conf.c,v 1.51 2003/05/14 18:11:18 ho Exp $	*/
 /*	$EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $	*/
 
 /*
@@ -417,6 +417,7 @@ conf_load_defaults (int tr)
   conf_set (tr, "General", "Retransmits", CONF_DFLT_RETRANSMITS, 0, 1);
   conf_set (tr, "General", "Exchange-max-time", CONF_DFLT_EXCH_MAX_TIME, 0, 1);
   conf_set (tr, "General", "Policy-file", CONF_DFLT_POLICY_FILE, 0, 1);
+  conf_set (tr, "General", "Pubkey-directory", CONF_DFLT_PUBKEY_DIR, 0, 1);
 
 #ifdef USE_X509
   conf_set (tr, "X509-certificates", "CA-directory", CONF_DFLT_X509_CA_DIR, 0,
diff --git a/sbin/isakmpd/conf.h b/sbin/isakmpd/conf.h
index c6db4257278..0a80e8c90f6 100644
--- a/sbin/isakmpd/conf.h
+++ b/sbin/isakmpd/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.21 2003/02/04 20:02:00 markus Exp $	*/
+/*	$OpenBSD: conf.h,v 1.22 2003/05/14 18:11:18 ho Exp $	*/
 /*	$EOM: conf.h,v 1.13 2000/09/18 00:01:47 ho Exp $	*/
 
 /*
@@ -64,7 +64,7 @@
 #define CONF_DFLT_X509_CERT_DIR        "/etc/isakmpd/certs/"
 #define CONF_DFLT_X509_PRIVATE_KEY     "/etc/isakmpd/private/local.key"
 #define CONF_DFLT_X509_CRL_DIR         "/etc/isakmpd/crls/"
-
+#define CONF_DFLT_PUBKEY_DIR           "/etc/isakmpd/pubkeys/"
 #define CONF_DFLT_KEYNOTE_CRED_DIR     "/etc/isakmpd/keynote/"
 
 #define CONF_DFLT_TAG_PHASE1_CONFIG    "Default-phase-1-configuration"
diff --git a/sbin/isakmpd/ike_auth.c b/sbin/isakmpd/ike_auth.c
index a195b515d74..b6eb3efd3a4 100644
--- a/sbin/isakmpd/ike_auth.c
+++ b/sbin/isakmpd/ike_auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ike_auth.c,v 1.68 2003/03/13 13:24:48 ho Exp $	*/
+/*	$OpenBSD: ike_auth.c,v 1.69 2003/05/14 18:11:19 ho Exp $	*/
 /*	$EOM: ike_auth.c,v 1.59 2000/11/21 00:21:31 angelos Exp $	*/
 
 /*
@@ -91,7 +91,6 @@ static int rsa_sig_encode_hash (struct message *);
 #endif
 
 #if defined (USE_RAWKEY)
-#define PUBKEY_DIR_DEFAULT "/etc/isakmpd/pubkeys"
 static int get_raw_key_from_file (int, u_int8_t *, size_t, RSA **);
 #endif
 
@@ -1217,7 +1216,7 @@ get_raw_key_from_file (int type, u_int8_t *id, size_t id_len, RSA **rsa)
 
   fstr = conf_get_str ("General", "Pubkey-directory");
   if (!fstr)
-    fstr = PUBKEY_DIR_DEFAULT;
+    fstr = CONF_DFLT_PUBKEY_DIR;
 
   if (snprintf (filename, sizeof filename, "%s/", fstr) > sizeof filename - 1)
     return -1;