diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2002-11-15 14:58:39 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2002-11-15 14:58:39 +0000 |
| commit | 8b07dccb7adfbe7c4389938b3faa7f76776f2535 (patch) | |
| tree | 5600973c1d1ed7993537205a9ca8d80fcfddfed4 /sbin/isakmpd/conf.c | |
| parent | 77500b5209faabc24efa36694f6a0ce1722c3e90 (diff) | |
Missing "Configuration" tag in a Phase-1 peer was not handled correctly,
pointed out by Aref Taidi. Replace this with a "Default-Phase-1-Configuration"
that will be used if this tag is missing from the peer. Update manpage
accordingly. niklas@ ok.
Diffstat (limited to 'sbin/isakmpd/conf.c')
| -rw-r--r-- | sbin/isakmpd/conf.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c index 71300adcc83..052498e515f 100644 --- a/sbin/isakmpd/conf.c +++ b/sbin/isakmpd/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.46 2002/11/14 16:13:27 ho Exp $ */ +/* $OpenBSD: conf.c,v 1.47 2002/11/15 14:58:38 ho Exp $ */ /* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */ /* @@ -446,6 +446,12 @@ conf_load_defaults (int tr) conf_set (tr, CONF_DFLT_TAG_LIFE_QUICK_MODE, "LIFE_DURATION", (dflt ? dflt : CONF_DFLT_VAL_LIFE_QUICK_MODE), 0, 1); + /* Default Phase-1 Configuration section */ + conf_set (tr, CONF_DFLT_TAG_PHASE1_CONFIG, "EXCHANGE_TYPE", + CONF_DFLT_PHASE1_EXCH_TYPE, 0, 1); + conf_set (tr, CONF_DFLT_TAG_PHASE1_CONFIG, "Transforms", + CONF_DFLT_PHASE1_TRANSFORMS, 0, 1); + /* Main modes */ for (enc = 0; mm_enc[enc]; enc ++) for (hash = 0; mm_hash[hash]; hash ++) |