Merge with EOM 1.28

author: angelos
Manpage support in the Makefiles, mention in README.

author: niklas
Up-to-date

author: niklas
Typo + mail change for ho

1 files changed, 20 insertions, 18 deletions

diff --git a/sbin/isakmpd/README b/sbin/isakmpd/README
index b4d98f0fb87..29d4bce4f63 100644
--- a/sbin/isakmpd/README
+++ b/sbin/isakmpd/README
@@ -1,27 +1,28 @@
-$OpenBSD: README,v 1.14 1999/08/26 22:31:24 niklas Exp $
-$EOM: README,v 1.25 1999/08/12 22:33:03 niklas Exp $
+$OpenBSD: README,v 1.15 2000/01/26 15:23:45 niklas Exp $
+$EOM: README,v 1.28 1999/10/10 22:53:24 angelos Exp $
 
 This is isakmpd, a BSD-licensed ISAKMP/Oakley (a.k.a. IKE)
 implementation.  It's written by Niklas Hallqvist and Niels Provos,
 funded by Ericsson Radio Systems AB.  Currently it is work in
-progress, although it can be used for real setups.  It is not
-released, thus I won't bother calling it any version numbers.  When
-you got the source, hopefully the archive was named with a date which
-reflects when it was created.  These archives are also known as
-snapshots and will be created at irregular intervals and put up on
-ftp.gsnig.net and ftp.appli.se in /pub/isakmpd.  From Nov 14, 1998
-isakmpd is also available in the OpenBSD main source tree under
-src/sbin/isakmpd, though slightly modified because I don't want to
-carry support files for other OSes in that distribution.  Look at
-http://www.openbsd.org/ for details on how to get OpenBSD source.
+progress, although it can be used for real setups.  There are
+releases, but this distribution is not a release and is not named with
+ordinary version numbers.  When you got the source, hopefully the
+archive was named with a date which reflects when it was created.
+These archives are also known as snapshots and will be created at
+irregular intervals and put up on ftp.gsnig.net and ftp.appli.se in
+/pub/isakmpd.  From Nov 14, 1998 isakmpd is also available in the
+OpenBSD main source tree under src/sbin/isakmpd, though slightly
+modified because I don't want to carry support files for other OSes in
+that distribution.  Look at http://www.openbsd.org/ for details on how
+to get OpenBSD source.
 
 Isakmpd is being developed under OpenBSD, with OpenBSD as its primary
 target, however, it is ported to Linux with FreeS/WAN IPsec.  The
 makefile support assumes a BSD environment noneheless as it is not too
 hard to get such an environment to work under other operating systems.
-For example, Red Hat 5.2 ships with pmake installed.  Read sysdep/README
+For example, Red Hat 5.2 shipped with pmake installed.  Read sysdep/README
 for further details about this issue.  Other systems isakmpd has been
-ported to, but no code has been made available for, inlcudes Solaris
+ported to, but no code has been made available for, includes Solaris
 and Win32s.  I mention this just because it shows that the code is
 fairly portable.
 
@@ -34,8 +35,7 @@ make obj && make depend && make
 
 Then obj/isakmpd will be the daemon.  I suggest you try it by running
 under gdb with args similar to:
-	-d -n -p5000 -D0=99 -D1=99 -D2=99 -D3=99 -D4=99 -D5=99 -D6=99 -D7=99 \
-	-f/tmp/isakmpd.fifo -csamples/VPN-east.conf
+	-d -n -p5000 -DA=99 -f/tmp/isakmpd.fifo -csamples/VPN-east.conf
 
 That will run isakmpd in the foreground, not connected to any application
 (like an IPSEC implementation) logging to stderr with full debugging ouput,
@@ -66,10 +66,12 @@ greater fun.  This rudimentary user interface is slightly described in
 DESIGN-NOTES.  If you are going to look at the config file, don't be scared,
 the man page isakmpd.conf(5) covers every detail, and the flexibility will
 be hidden under a userfriendlier layer in a later release.  I did this
-first config-file syntax just because it should be easy to parse.
+first config-file syntax just because it should be easy to parse. The man
+page isakmpd.policy(5) describes the policy model used in conjunction with
+KeyNote.
 
 Happy IKEing!
 
 Niklas Hallqvist <niklas@openbsd.org>
 Niels Provos <provos@openbsd.org>
-Håkan Olsson <ho@netman.se>
+Håkan Olsson <ho@openbsd.org>