Merge with EOM 1.31

author: angelos
Document the ID section/tag for Phase 1 exchanges.

1 files changed, 38 insertions, 2 deletions

diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index 28def809256..db18d6f509d 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,5 +1,5 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.24 1999/07/18 09:49:07 niklas Exp $
-.\" $EOM: isakmpd.conf.5,v 1.30 1999/07/18 09:52:09 niklas Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.25 1999/08/26 22:28:43 niklas Exp $
+.\" $EOM: isakmpd.conf.5,v 1.31 1999/08/20 01:20:44 angelos Exp $
 .\"
 .\" Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
 .\"
@@ -175,6 +175,11 @@ The name of the ISAKMP-configuration section to use.  Look at
 .It Em Authentication
 Authentication data for this specific peer.  In the case of
 preshared key, this is the key value itself.
+.It Em ID
+If existent, the name of the section that describes the
+local client ID that we should present to our peer. If not present, it
+defaults to the address of the local interface we are sending packets
+over to the remote daemon. Look at <Phase1-ID> below.
 .It Em Flags
 A comma-separated list of flags controlling the further
 handling of the ISAKMP SA.  Currently there are no specific
@@ -183,6 +188,37 @@ ISAKMP SA flags defined.
 A Linux FreeS/WAN specific value which should be the IP address of the
 next hop along the path to reach the peer, usually a router.
 .El
+.It Em <Phase1-ID>
+.Bl -tag -width 12n
+.It Em ID-type
+The ID type as given by the RFCs.  For Phase 1 this is currently
+.Li IPV4_ADDR ,
+.Li IPV4_ADDR_SUBNET ,
+.Li FQDN , 
+or
+.Li USER_FQDN .
+.It Em Address
+If the ID-type is
+.Li IPV4_ADDR ,
+this tag should exist and be an IP-address.
+.It Em Network
+If the ID-type is
+.Li IPV4_ADDR_SUBNET
+this tag should exist and
+be a network address.
+.It Em Netmask
+If the ID-type is
+.Li IPV4_ADDR_SUBNET
+this tag should exist and
+be a network subnet mask.
+.It Em Name
+If the ID-type is
+.Li FQDN
+or
+.Li USER_FQDN ,
+this tag should exist and contain a domain name or a user@domain
+string respectively.
+.El
 .It Em <ISAKMP-configuration>
 .Bl -tag -width 12n
 .It Em DOI