Merge with EOM 1.20
authorniklas <niklas@openbsd.org>
Fri, 7 Apr 2000 22:04:02 +0000 (22:04 +0000)
committerniklas <niklas@openbsd.org>
Fri, 7 Apr 2000 22:04:02 +0000 (22:04 +0000)
commitf92d60eb4f825d64412e47cb01956120d2d2e14a
tree2849387c10d4ee5bc1741cc5e47183eac5527a02
parentd35ad000c51d317da2f222cb8c1adf91c2276bf8
Merge with EOM 1.20

author: niklas
Hmm keynote does not exist in a dynamically linked version

author: angelos
Add phase_1 attribute.
sbin/isakmpd/policy.c