summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-06-10 21:23:51 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-06-10 21:23:51 +0000
commit5bfb1a93fa0a1fcb52979d9ece02b37114935e1a (patch)
tree71823d1e821945c5ce7941038b1bd11512a805d9 /sbin
parente75260f6b387f9e85f99cc9bbea479f087da1bd0 (diff)
Document -S and the "Delete-SAs" tag. Those will enable SA deletion
on shutdown.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/isakmpd.88
-rw-r--r--sbin/isakmpd/isakmpd.conf.58
2 files changed, 13 insertions, 3 deletions
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index cd7e15e5058..dc34a28d516 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.85 2006/05/26 09:26:07 jmc Exp $
+.\" $OpenBSD: isakmpd.8,v 1.86 2006/06/10 21:23:50 hshoexer Exp $
.\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $
.\"
.\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.
@@ -39,7 +39,7 @@
.Sh SYNOPSIS
.Nm isakmpd
.Bk -words
-.Op Fl 46adKLnTv
+.Op Fl 46adKLnSTv
.Op Fl c Ar config-file
.Xo
.Oo Fl D
@@ -258,6 +258,10 @@ flag.
Note that only paths beginning with
.Pa /var/run
are allowed.
+.It Fl S
+When this option is given,
+.Nm
+will delete SAs on shutdown by sending delete messages to all peers.
.It Fl T
When this option is given, NAT-Traversal will be disabled and
.Nm
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index 2e7dc0119f2..deb258cf79e 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.113 2006/06/10 21:09:45 msf Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.114 2006/06/10 21:23:50 hshoexer Exp $
.\" $EOM: isakmpd.conf.5,v 1.57 2000/12/21 14:43:17 ho Exp $
.\"
.\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -295,6 +295,12 @@ other programs like
.Xr ipsecctl 8
or
.Xr bgpd 8 .
+.It Em Delete-SAs
+This tag controls wether
+.Xr isakmpd 8
+deletes SAs on shutdown or not.
+The default value is
+.Qq no .
.El
.It Bq Sy Phase 1
ISAKMP SA negotiation parameter root