From dbd43cc24d6c18f6bf279c4e52a7a01d2bdfb8c5 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Tue, 23 Jun 2015 14:12:29 -0300
Subject: [PATCH] Instead of sending USR1, just call ipsec reload. And before
 it, call ipsec rereadsecrets to make sure new secretes are updated. It should
 fix #4785

---
 etc/inc/vpn.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 96ba4a7c4a..6c18bc4195 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1247,7 +1247,8 @@ EOD;
 		if (isvalidpid("{$g['varrun_path']}/starter.charon.pid")) {
 			/* Update configuration changes */
 			/* Read secrets */
-			sigkillbypid("{$g['varrun_path']}/starter.charon.pid", 'USR1');
+			mwexec("/usr/local/sbin/ipsec rereadsecrets", false);
+			mwexec("/usr/local/sbin/ipsec reload", false);
 		} else {
 			mwexec("/usr/local/sbin/ipsec start", false);
 		}