diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-03-11 20:38:57 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-03-11 20:41:56 -0500 |
| commit | 1ca17c45c10229c340b61d3b66f72352513eebe6 (patch) | |
| tree | c7f49f7856ffd2a62b809a621fac4a8eefb8bf5f | |
| parent | 934c88ee9535919b8b75b6e939b2a6becb9561bd (diff) | |
| download | pfsense-1ca17c45c10229c340b61d3b66f72352513eebe6.zip pfsense-1ca17c45c10229c340b61d3b66f72352513eebe6.tar.gz | |
Move libstrongswan-unity.so when Unity plugin is disabled so it can't modify the P2. Workaround for Ticket #4178
Conflicts:
etc/inc/vpn.inc
| -rw-r--r-- | etc/inc/vpn.inc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index d6ddebb..e3a47f8 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -307,9 +307,19 @@ function vpn_ipsec_configure($restart = false) } $unity_enabled = 'yes'; - if (isset($config['ipsec']['unityplugin'])) + if (isset($config['ipsec']['unityplugin'])) { $unity_enabled = 'no'; - + if (file_exists("/usr/local/lib/ipsec/plugins/libstrongswan-unity.so")) { + conf_mount_rw(); + mwexec("mv /usr/local/lib/ipsec/plugins/libstrongswan-unity.so /usr/local/lib/ipsec/plugins/libstrongswan-unity.MOVED"); + conf_mount_ro(); + } + } else if (file_exists("/usr/local/lib/ipsec/plugins/libstrongswan-unity.MOVED")) { + conf_mount_rw(); + mwexec("mv /usr/local/lib/ipsec/plugins/libstrongswan-unity.MOVED /usr/local/lib/ipsec/plugins/libstrongswan-unity.so"); + conf_mount_ro(); + } + if (isset($config['ipsec']['enableinterfacesuse'])) { if (!empty($ifacesuse)) { $ifacesuse = 'interfaces_use = ' . implode(',', array_unique($ifacesuse)); @@ -1779,4 +1789,4 @@ EOD; return 0; } -?>
\ No newline at end of file +?> |
