Module Name: src
Committed By: vanhu
Date: Mon Mar 14 09:19:24 UTC 2011
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: handler.c
Log Message:
check if we got RMCONF_ERR_MULTIPLE from getrmconf_by_ph1() in
revalidate_ph1tree_rmconf()
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 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.36 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.37
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.36 Fri Mar 11 14:30:07 2011
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Mon Mar 14 09:19:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: handler.c,v 1.36 2011/03/11 14:30:07 vanhu Exp $ */
+/* $NetBSD: handler.c,v 1.37 2011/03/14 09:19:23 vanhu Exp $ */
/* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
@@ -1486,6 +1486,7 @@
static int revalidate_ph1tree_rmconf(void)
{
struct ph1handle *p, *next;
+ struct remoteconf *rmconf;
for (p = LIST_FIRST(&ph1tree); p; p = next) {
next = LIST_NEXT(p, chain);
@@ -1495,9 +1496,11 @@
if (p->rmconf == NULL)
continue;
- p->rmconf = getrmconf_by_ph1(p);
- if (p->rmconf == NULL || p->rmconf == RMCONF_ERR_MULTIPLE)
+ rmconf = getrmconf_by_ph1(p);
+ if (rmconf == NULL || rmconf == RMCONF_ERR_MULTIPLE)
remove_ph1(p);
+ else
+ p->rmconf = rmconf;
}
return 1;
