Merge with EOM 1.14
authorniklas <niklas@openbsd.org>
Fri, 7 Apr 2000 22:49:54 +0000 (22:49 +0000)
committerniklas <niklas@openbsd.org>
Fri, 7 Apr 2000 22:49:54 +0000 (22:49 +0000)
commit3e9923c82d7c6a72fde146982d2b9ded8a0328f0
tree64d8b1a3ff460072050ddc55a963a5a33997c094
parent4e662979d496bf3977d07e4d270225ba3ea0021c
Merge with EOM 1.14

author: angelos
*_ike_address -> *_negotiation_address (so it's not IKE specific)
sbin/isakmpd/isakmpd.policy.5