[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS: cvs.openbsd.org: src



CVSROOT:	/cvs
Module name:	src
Changes by:	bluhm_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	2008/07/01 09:00:54

Modified files:
	sbin/isakmpd   : pf_key_v2.c 
	sbin/ipsecctl  : ike.c ipsecctl.c ipsecctl.h 
	regress/sbin/ipsecctl: ike1.ok ike10.ok ike11.ok ike12.ok 
	                       ike13.ok ike14.ok ike15.ok ike16.ok 
	                       ike17.ok ike18.ok ike19.ok ike2.ok 
	                       ike20.ok ike21.ok ike22.ok ike23.ok 
	                       ike29.ok ike3.ok ike30.ok ike31.ok 
	                       ike32.ok ike33.ok ike34.ok ike35.ok 
	                       ike36.ok ike37.ok ike38.ok ike39.ok 
	                       ike4.ok ike40.ok ike41.ok ike42.ok 
	                       ike43.ok ike46.ok ike47.ok ike48.ok 
	                       ike49.ok ike5.ok ike50.ok ike51.ok 
	                       ike52.ok ike53.ok ike54.ok ike55.ok 
	                       ike56.ok ike57.ok ike58.ok ike59.ok 
	                       ike6.ok ike7.ok ike8.ok ike9.ok 
	                       ikedel1.ok ikedel10.ok ikedel11.ok 
	                       ikedel12.ok ikedel13.ok ikedel14.ok 
	                       ikedel15.ok ikedel16.ok ikedel17.ok 
	                       ikedel18.ok ikedel19.ok ikedel2.ok 
	                       ikedel20.ok ikedel21.ok ikedel22.ok 
	                       ikedel23.ok ikedel29.ok ikedel3.ok 
	                       ikedel30.ok ikedel31.ok ikedel32.ok 
	                       ikedel33.ok ikedel34.ok ikedel35.ok 
	                       ikedel36.ok ikedel37.ok ikedel38.ok 
	                       ikedel39.ok ikedel4.ok ikedel40.ok 
	                       ikedel41.ok ikedel42.ok ikedel43.ok 
	                       ikedel46.ok ikedel47.ok ikedel5.ok 
	                       ikedel6.ok ikedel7.ok ikedel8.ok 
	                       ikedel9.ok ikefail6.ok 

Log message:
Isakmpd acquire mode did not work with a config generated from
ipsec.conf.  The config created by isakmpd dynamically was different
from the config that ipsecctl generated out of ipsec.conf.

Both config formats are changed so that they match.  One needs a
passive ike line and a require flow line with the same parameters
in the ipsec.conf.  Then the acquire message generated by the kernel
will trigger isakmpd to generate a config that matches the one that
ipsecctl generated from the ike line.

ok hshoexer, 'sounds good' todd