From 9a66dfe56a9c24c0b688884206b89d9e8151f1c8 Mon Sep 17 00:00:00 2001
From: Seth Mos <seth.mos@xs4all.nl>
Date: Fri, 11 May 2007 07:14:13 +0000
Subject: Do not flush SPA and SPD before starting. It upsets racoon.

---
 etc/inc/vpn.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index a6a3609..16b4bb8 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -561,11 +561,12 @@ EOD;
 			if(is_process_running("racoon")) {
 				/* We are already online, reload */
 				mwexec("/usr/local/sbin/racoonctl reload-config");
+				sleep(1);
+				exec("/usr/bin/ps auxw | grep \"/usr/local/sbin/[r]acoon\" | awk '{print $2}'", $racoonpid);
+				if(! empty($racoonpid)) {
+					mwexec("/usr/bin/kill -HUP $racoonpid[0]");
+				}
 			} else {
-				/* flush SPD and SAD */
-				mwexec("/sbin/setkey -FP");
-				mwexec("/sbin/setkey -F");
-
 				/* sleep for a bit */
 				sleep (2);
 
-- 
cgit v1.1