Module Name: src
Committed By: tteras
Date: Mon Apr 20 13:25:28 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_7-branch]:
handler.c
Log Message:
>From Paul Moore: Phase2 message id's should be unique wrt phase1, not
globally.
To generate a diff of this commit:
cvs rdiff -u -r1.9.6.7 -r1.9.6.8 \
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.9.6.7 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.9.6.8
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.9.6.7 Fri Jan 11 14:12:00 2008
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Mon Apr 20 13:25:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: handler.c,v 1.9.6.7 2008/01/11 14:12:00 vanhu Exp $ */
+/* $NetBSD: handler.c,v 1.9.6.8 2009/04/20 13:25:27 tteras Exp $ */
/* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
@@ -479,7 +479,7 @@
struct ph2handle *p;
LIST_FOREACH(p, &ph2tree, chain) {
- if (p->msgid == msgid)
+ if (p->msgid == msgid && p->ph1 == iph1)
return p;
}
