Revision 1ca17c45
Added by Chris Buechler over 10 years ago
| etc/inc/vpn.inc | ||
|---|---|---|
| 307 | 307 |
} |
| 308 | 308 |
|
| 309 | 309 |
$unity_enabled = 'yes'; |
| 310 |
if (isset($config['ipsec']['unityplugin'])) |
|
| 310 |
if (isset($config['ipsec']['unityplugin'])) {
|
|
| 311 | 311 |
$unity_enabled = 'no'; |
| 312 |
|
|
| 312 |
if (file_exists("/usr/local/lib/ipsec/plugins/libstrongswan-unity.so")) {
|
|
| 313 |
conf_mount_rw(); |
|
| 314 |
mwexec("mv /usr/local/lib/ipsec/plugins/libstrongswan-unity.so /usr/local/lib/ipsec/plugins/libstrongswan-unity.MOVED");
|
|
| 315 |
conf_mount_ro(); |
|
| 316 |
} |
|
| 317 |
} else if (file_exists("/usr/local/lib/ipsec/plugins/libstrongswan-unity.MOVED")) {
|
|
| 318 |
conf_mount_rw(); |
|
| 319 |
mwexec("mv /usr/local/lib/ipsec/plugins/libstrongswan-unity.MOVED /usr/local/lib/ipsec/plugins/libstrongswan-unity.so");
|
|
| 320 |
conf_mount_ro(); |
|
| 321 |
} |
|
| 322 |
|
|
| 313 | 323 |
if (isset($config['ipsec']['enableinterfacesuse'])) {
|
| 314 | 324 |
if (!empty($ifacesuse)) {
|
| 315 | 325 |
$ifacesuse = 'interfaces_use = ' . implode(',', array_unique($ifacesuse));
|
| ... | ... | |
| 1779 | 1789 |
return 0; |
| 1780 | 1790 |
} |
| 1781 | 1791 |
|
| 1782 |
?> |
|
| 1792 |
?> |
|
Also available in: Unified diff
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