diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-01-23 02:41:38 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-01-23 02:41:38 -0600 |
| commit | d9a17eafb69f02a85f7cd3c3060d137cdc95f70e (patch) | |
| tree | 4a981f815c3f4113004e4e3c0623e5eaf376276f /src/etc | |
| parent | 4d47827275a3ee5fdafd95773eb6924b2698c611 (diff) | |
| download | pfsense-d9a17eafb69f02a85f7cd3c3060d137cdc95f70e.zip pfsense-d9a17eafb69f02a85f7cd3c3060d137cdc95f70e.tar.gz | |
Switch to disabling strongswan unity plugin by default. Ticket #4178
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 12 | ||||
| -rw-r--r-- | src/etc/inc/vpn.inc | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index c3e0b49..2fde4b6 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "13.7", + "latest_config" => "13.8", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index d627f11..8c2b837 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4314,4 +4314,16 @@ function upgrade_136_to_137() { } } +function upgrade_137_to_138() { + global $config; + + // the presence of unityplugin tag used to disable loading of unity plugin + // it's now disabled by default, and config tag is to enable. Unset accordingly. + if (is_array($config['ipsec'])) { + if (isset($config['ipsec']['unityplugin'])) { + unset($config['ipsec']['unityplugin']); + } + } +} + ?> diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc index 0cf943c..46263a1 100644 --- a/src/etc/inc/vpn.inc +++ b/src/etc/inc/vpn.inc @@ -434,7 +434,7 @@ function vpn_ipsec_configure($restart = false) { $i_dont_care_about_security_and_use_aggressive_mode_psk = "i_dont_care_about_security_and_use_aggressive_mode_psk=yes"; } - $unity_enabled = isset($config['ipsec']['unityplugin']) ? 'no' : 'yes'; + $unity_enabled = isset($config['ipsec']['unityplugin']) ? 'yes' : 'no'; $makebeforebreak = ''; if (isset($config['ipsec']['makebeforebreak'])) { |
