CVS commit: src/crypto/dist/ipsec-tools/src/racoon

[Timo Teräs]

Module Name:    src
Committed By:   tteras
Date:           Tue Dec 28 06:00:18 UTC 2010

Modified Files:
        src/crypto/dist/ipsec-tools/src/racoon: handler.c

Log Message:
>From Roman Hoog Antink <r...@open.ch>: Fix config reload to not delete
too many phase 2 handles, because wrong chain field is used when
enumerating the handles.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/crypto/dist/ipsec-tools/src/racoon/handler.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/crypto/dist/ipsec-tools/src/racoon/handler.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.34 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.35
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.34	Wed Nov 17 10:40:41 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c	Tue Dec 28 06:00:18 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: handler.c,v 1.34 2010/11/17 10:40:41 tteras Exp $	*/
+/*	$NetBSD: handler.c,v 1.35 2010/12/28 06:00:18 tteras Exp $	*/
 
 /* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
 
@@ -1468,7 +1468,7 @@
 	if (iph1->status == PHASE1ST_ESTABLISHED ||
 	    iph1->status == PHASE1ST_DYING) {
 		for (iph2 = LIST_FIRST(&iph1->ph2tree); iph2; iph2 = iph2_next) {
-			iph2_next = LIST_NEXT(iph2, chain);
+			iph2_next = LIST_NEXT(iph2, ph1bind);
 			remove_ph2(iph2);
 		}
 		isakmp_info_send_d1(iph1);