Actually remove the spd reload files after processing it. This would break the tunnels as it would re-process all files in order every time the configuration reloads a

tunnel.

1 files changed, 8 insertions, 8 deletions

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index aa0857f..30fdefb 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1498,17 +1498,17 @@ function vpn_ipsec_refresh_policies() {
 	$tmpfiles = array();
 	$dh  = opendir($g['tmp_path']);
 	while (false !== ($filename = readdir($dh))) {
-		$tmpfiles[] = $filename;
+		if(preg_match("/^spd.conf.reload./", $tmpfile)) {
+			$tmpfiles[] = $filename;
+		}
 	}
 	sort($tmpfiles);
 	foreach($tmpfiles as $tmpfile) {
-		if(preg_match("/^spd.conf.reload./", $tmpfile)) {
-			$ret = mwexec("/usr/local/sbin/setkey -f {$g['tmp_path']}/{$tmpfile} 2>&1", false);
-			if($ret == 0) {
-				// unlink_if_exists("{$g['tmp_path']}/{$tmpfile}");
-			} else {
-				rename("{$g['tmp_path']}/{$tmpfile}", ("{$g['tmp_path']}/failed.{$tmpfile}"));
-			}
+		$ret = mwexec("/usr/local/sbin/setkey -f {$g['tmp_path']}/{$tmpfile} 2>&1", false);
+		if($ret == 0) {
+			unlink_if_exists("{$g['tmp_path']}/{$tmpfile}");
+		} else {
+			rename("{$g['tmp_path']}/{$tmpfile}", ("{$g['tmp_path']}/failed.{$tmpfile}"));
 		}
 	}
 }