summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2006-09-09 07:52:04 +0000
committerjmc <jmc@openbsd.org>2006-09-09 07:52:04 +0000
commit9c4fa59baed7abf066aab3adc83121a350a1fe10 (patch)
treecac513c9e611adb8a3c61df406ef9dd7d47c9646
parentfix RSA signature padding vulnerability in OpenSSL libcrypto CVE-2006-4339; (diff)
downloadwireguard-openbsd-9c4fa59baed7abf066aab3adc83121a350a1fe10.tar.xz
wireguard-openbsd-9c4fa59baed7abf066aab3adc83121a350a1fe10.zip
point people towards ipsec.conf.5; after some discussion w/ reyk
ok hshoexer reyk
-rw-r--r--sbin/isakmpd/isakmpd.818
1 files changed, 16 insertions, 2 deletions
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index db097cff8ff..67d5604e9d7 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.92 2006/09/01 00:49:45 jmc Exp $
+.\" $OpenBSD: isakmpd.8,v 1.93 2006/09/09 07:52:04 jmc Exp $
.\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $
.\"
.\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.
@@ -30,7 +30,7 @@
.\"
.\" Manual page, using -mandoc macros
.\"
-.Dd August 07, 2002
+.Dd September 9, 2006
.Dt ISAKMPD 8
.Os
.Sh NAME
@@ -60,6 +60,13 @@ and/or authenticated network traffic.
At this moment, and probably forever, this means
.Xr ipsec 4
traffic.
+Traditionally,
+.Nm
+was configured using the
+.Xr isakmpd.conf 5
+file format.
+A newer, much simpler format is now available:
+.Xr ipsec.conf 5 .
.Pp
The way
.Nm
@@ -124,6 +131,12 @@ only by the user running the daemon.
will reread the configuration file when sent a
.Dv SIGHUP
signal.
+.Pp
+Note that this option applies only to configuration files in the
+.Xr isakmpd.conf 5
+format, not those in the
+.Xr ipsec.conf 5
+format.
.It Fl D Ar class Ns = Ns Ar level
Debugging class.
It's possible to specify this argument many times.
@@ -755,6 +768,7 @@ command is issued in the command FIFO.
.Xr getnameinfo 3 ,
.Xr pcap 3 ,
.Xr ipsec 4 ,
+.Xr ipsec.conf 5 ,
.Xr isakmpd.conf 5 ,
.Xr isakmpd.policy 5 ,
.Xr ssl 8 ,