summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-06-10 21:07:11 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-06-10 21:07:11 +0000
commit350f0878a0b488ca908d2396b6439865c8e3e25d (patch)
tree7b33bc670d48dd93089f49015fb55d9b2dfe41cf /sbin
parent7c50376028903e7a2c25f7e854d1c642f39536c8 (diff)
This shouldn't have been commited yet.
Diffstat (limited to 'sbin')
-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 306ac2bc18a..31c7991e0e7 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.88 2006/06/10 20:10:02 hshoexer Exp $ */
+/* $OpenBSD: conf.c,v 1.89 2006/06/10 21:07:10 hshoexer Exp $ */
/* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */
/*
@@ -484,8 +484,6 @@ conf_load_defaults(int tr)
conf_set(tr, "KeyNote", "Credential-directory",
CONF_DFLT_KEYNOTE_CRED_DIR, 0, 1);
- conf_set(tr, "General", "Delete-SAs", CONF_DFLT_DELETE_SAS, 0, 1);
-
/* Lifetimes. XXX p1/p2 vs main/quick mode may be unclear. */
dflt = conf_get_trans_str(tr, "General", "Default-phase-1-lifetime");
conf_set(tr, CONF_DFLT_TAG_LIFE_MAIN_MODE, "LIFE_TYPE",