mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to disabling strongswan unity plugin by default. Ticket #4178

Browse Source
This commit is contained in:
Chris Buechler 2016-01-23 02:41:38 -06:00
parent 4d47827275
commit d9a17eafb6
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf.default/config.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<pfsense>
<version>13.7</version>
<version>13.8</version>
<lastchange/>
<system>
<optimization>normal</optimization>

2
src/etc/inc/globals.inc
View File

@ -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",

12
src/etc/inc/upgrade_config.inc
View File

@ -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']);
}
}
}
?>

2
src/etc/inc/vpn.inc
View File

@ -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'])) {

6
src/usr/local/www/vpn_ipsec_settings.php
View File

@ -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',