[Ipsec-tools-commits] ipsec-tools/src/racoon isakmp_cfg.c,1.36,1.37

[Frédéric S. <fr...@us...>]

Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5141/src/racoon

Modified Files:
	isakmp_cfg.c 
Log Message:
Fix the switch so that the phase1 script is executed at the end of the mode
cfg exchange ; add a debug message at the script startup.


Index: isakmp_cfg.c
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp_cfg.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- isakmp_cfg.c	9 May 2005 09:25:25 -0000	1.36
+++ isakmp_cfg.c	30 May 2005 20:12:16 -0000	1.37
@@ -442,10 +442,11 @@
 	 * It is done at the end of phase 1 if ISAKMP mode config is not
 	 * requested.
 	 */
+	
 	if ((iph1->status == PHASE1ST_ESTABLISHED) && 
 	    iph1->rmconf->mode_cfg) {
 		switch (AUTHMETHOD(iph1)) {
-		case OAKLEY_ATTR_AUTH_METHOD_XAUTH_PSKEY_I:
+		case FICTIVE_AUTH_METHOD_XAUTH_PSKEY_I:
 		case OAKLEY_ATTR_AUTH_METHOD_HYBRID_RSA_I:
 		/* Unimplemented */
 		case OAKLEY_ATTR_AUTH_METHOD_HYBRID_DSS_I: 
@@ -1733,6 +1734,8 @@
 	int i, p;
 	int test;
 
+	plog(LLV_DEBUG, LOCATION, NULL, "Starting a script.\n");
+
 	/* 
 	 * Internal IPv4 address, either if 
 	 * we are a client or a server.