diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-05-02 14:37:01 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-05-02 14:37:01 +0000 |
commit | 72a4d4203b22931174551a88523fc297350d39b9 (patch) | |
tree | 4d23bab5d6297648bc6e44bfe133f8d97cffdee9 /sbin/isakmpd/ui.c | |
parent | a080c32b50bc3a028b2dd4381df6e20d6acdc4b7 (diff) |
conf.h: Merge with EOM 1.11
ui.c: Merge with EOM 1.41
author: niklas
From ho: provide defaults for requested transforms, shortens config files
vastly.
Diffstat (limited to 'sbin/isakmpd/ui.c')
-rw-r--r-- | sbin/isakmpd/ui.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/isakmpd/ui.c b/sbin/isakmpd/ui.c index baca4f6d128..22d07ad48cf 100644 --- a/sbin/isakmpd/ui.c +++ b/sbin/isakmpd/ui.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ui.c,v 1.15 2000/04/07 22:10:30 niklas Exp $ */ -/* $EOM: ui.c,v 1.40 2000/04/07 22:05:57 niklas Exp $ */ +/* $OpenBSD: ui.c,v 1.16 2000/05/02 14:37:00 niklas Exp $ */ +/* $EOM: ui.c,v 1.41 2000/05/01 20:57:33 niklas Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -147,7 +147,7 @@ ui_config (char *cmd) if (sscanf (cmd, "C %*s [%80[^]]]:%80[^=]=%80s %d", section, tag, value, &override) != 4) goto fail; - conf_set (trans, section, tag, value, override); + conf_set (trans, section, tag, value, override, 0); } else if (strcasecmp (subcmd, "rm") == 0) { @@ -235,6 +235,7 @@ ui_report (char *cmd) transport_report (); connection_report (); timer_report (); + conf_report (); } /* |