summaryrefslogtreecommitdiffstats
path: root/sbin/isakmpd/conf.c
diff options
context:
space:
mode:
authorcloder <cloder@openbsd.org>2005-04-05 20:46:20 +0000
committercloder <cloder@openbsd.org>2005-04-05 20:46:20 +0000
commit40eb29d6740eeb14141ecfd5b53664f35f1921f4 (patch)
tree9aac4505a88815c70437a7209c0757e9fe841e4a /sbin/isakmpd/conf.c
parentadd tcp sack stats, similar to freebsd; ok deraadt (diff)
downloadwireguard-openbsd-40eb29d6740eeb14141ecfd5b53664f35f1921f4.tar.xz
wireguard-openbsd-40eb29d6740eeb14141ecfd5b53664f35f1921f4.zip
Always compile X509 support. Almost everyone uses it. Makes the code
much easier to read and to maintain. OK and testing by hshoexer@, more testing by me
Diffstat (limited to 'sbin/isakmpd/conf.c')
-rw-r--r--sbin/isakmpd/conf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index 93f4f2278a8..ecde75a2773 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.77 2005/04/04 19:31:11 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.78 2005/04/05 20:46:20 cloder Exp $ */
/* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */
/*
@@ -475,7 +475,6 @@ conf_load_defaults(int tr)
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, 1);
conf_set(tr, "X509-certificates", "Cert-directory",
@@ -484,7 +483,6 @@ conf_load_defaults(int tr)
CONF_DFLT_X509_PRIVATE_KEY, 0, 1);
conf_set(tr, "X509-certificates", "CRL-directory",
CONF_DFLT_X509_CRL_DIR, 0, 1);
-#endif
#ifdef USE_KEYNOTE
conf_set(tr, "KeyNote", "Credential-directory",