summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-06-23 14:12:29 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-06-23 14:12:29 -0300
commitdbd43cc24d6c18f6bf279c4e52a7a01d2bdfb8c5 (patch)
treea36ba474a13410c095112eff136661166e036745 /etc
parentd30038e07914fd3cc4468e0e5002bc09145dabc3 (diff)
downloadpfsense-dbd43cc24d6c18f6bf279c4e52a7a01d2bdfb8c5.zip
pfsense-dbd43cc24d6c18f6bf279c4e52a7a01d2bdfb8c5.tar.gz
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
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/vpn.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 96ba4a7..6c18bc4 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);
}
OpenPOWER on IntegriCloud