summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2016-07-15 15:09:13 -0400
committerjim-p <jimp@pfsense.org>2016-07-15 15:09:13 -0400
commit1f954318266fc0da7ee41bb532da969ec9da8b95 (patch)
tree78a631a9b4fcd7e1f955899a8caa9d67a66ff823 /src
parentf0314a2a8267ef8b1657f1afa967519f384e14a9 (diff)
downloadpfsense-1f954318266fc0da7ee41bb532da969ec9da8b95.zip
pfsense-1f954318266fc0da7ee41bb532da969ec9da8b95.tar.gz
Make a function to resync all OpenVPN CSCs and use it when saving an OpenVPN server. Fixes #6139
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/openvpn.inc15
-rw-r--r--src/usr/local/www/vpn_openvpn_server.php1
2 files changed, 11 insertions, 5 deletions
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index 4d19151..cdefe8c 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -1278,6 +1278,15 @@ function openvpn_resync_csc(& $settings) {
}
}
+function openvpn_resync_csc_all() {
+ global $config;
+ if (is_array($config['openvpn']['openvpn-csc'])) {
+ foreach ($config['openvpn']['openvpn-csc'] as & $settings) {
+ openvpn_resync_csc($settings);
+ }
+ }
+}
+
function openvpn_delete_csc(& $settings) {
global $g, $config, $openvpn_tls_server_modes;
$csc_base_path = "{$g['varetc_path']}/openvpn-csc";
@@ -1359,11 +1368,7 @@ function openvpn_resync_all($interface = "") {
}
}
- if (is_array($config['openvpn']['openvpn-csc'])) {
- foreach ($config['openvpn']['openvpn-csc'] as & $settings) {
- openvpn_resync_csc($settings);
- }
- }
+ openvpn_resync_csc_all();
}
diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php
index f2d0974..57b1040 100644
--- a/src/usr/local/www/vpn_openvpn_server.php
+++ b/src/usr/local/www/vpn_openvpn_server.php
@@ -578,6 +578,7 @@ if ($_POST) {
write_config();
openvpn_resync('server', $server);
+ openvpn_resync_csc_all();
header("Location: vpn_openvpn_server.php");
exit;
OpenPOWER on IntegriCloud