diff options
| -rw-r--r-- | src/conf.default/config.xml | 2 | ||||
| -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 | ||||
| -rw-r--r-- | src/usr/local/www/vpn_ipsec_settings.php | 6 |
5 files changed, 18 insertions, 6 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 95a4999..4e71a27 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>13.7</version> + <version>13.8</version> <lastchange/> <system> <optimization>normal</optimization> 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'])) { diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index aabc5b5..03c44d5 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -359,10 +359,10 @@ $section->add($group); $section->addInput(new Form_Checkbox( 'unityplugin', - 'Disable Cisco Extensions', - 'Disable Unity Plugin', + 'Enable Cisco Extensions', + 'Enable Unity Plugin', $pconfig['unityplugin'] -))->setHelp('Disable Unity Plugin which provides Cisco Extension support as Split-Include, Split-Exclude, Split-Dns, ...'); +))->setHelp('Enable Unity Plugin which provides Cisco Extension support such as Split-Include, Split-Exclude and Split-Dns.'); $section->addInput(new Form_Checkbox( 'strictcrlpolicy', |
