Project

General

Profile

« Previous | Next » 

Revision d9a17eaf

Added by Chris Buechler over 9 years ago

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

View differences:

src/conf.default/config.xml
1 1
<?xml version="1.0"?>
2 2
<pfsense>
3
	<version>13.7</version>
3
	<version>13.8</version>
4 4
	<lastchange/>
5 5
	<system>
6 6
		<optimization>normal</optimization>
src/etc/inc/globals.inc
99 99
	"disablecrashreporter" => false,
100 100
	"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
101 101
	"debug" => false,
102
	"latest_config" => "13.7",
102
	"latest_config" => "13.8",
103 103
	"nopkg_platforms" => array("cdrom"),
104 104
	"minimum_ram_warning" => "101",
105 105
	"minimum_ram_warning_text" => "128 MB",
src/etc/inc/upgrade_config.inc
4314 4314
	}
4315 4315
}
4316 4316

  
4317
function upgrade_137_to_138() {
4318
	global $config;
4319

  
4320
	// the presence of unityplugin tag used to disable loading of unity plugin
4321
	// it's now disabled by default, and config tag is to enable. Unset accordingly. 
4322
	if (is_array($config['ipsec'])) {
4323
		if (isset($config['ipsec']['unityplugin'])) {
4324
			unset($config['ipsec']['unityplugin']);
4325
		}
4326
	}
4327
}
4328

  
4317 4329
?>
src/etc/inc/vpn.inc
434 434
		$i_dont_care_about_security_and_use_aggressive_mode_psk = "i_dont_care_about_security_and_use_aggressive_mode_psk=yes";
435 435
	}
436 436

  
437
	$unity_enabled = isset($config['ipsec']['unityplugin']) ? 'no' : 'yes';
437
	$unity_enabled = isset($config['ipsec']['unityplugin']) ? 'yes' : 'no';
438 438

  
439 439
	$makebeforebreak = '';
440 440
	if (isset($config['ipsec']['makebeforebreak'])) {
src/usr/local/www/vpn_ipsec_settings.php
359 359

  
360 360
$section->addInput(new Form_Checkbox(
361 361
	'unityplugin',
362
	'Disable Cisco Extensions',
363
	'Disable Unity Plugin',
362
	'Enable Cisco Extensions',
363
	'Enable Unity Plugin',
364 364
	$pconfig['unityplugin']
365
))->setHelp('Disable Unity Plugin which provides Cisco Extension support as Split-Include, Split-Exclude, Split-Dns, ...');
365
))->setHelp('Enable Unity Plugin which provides Cisco Extension support such as Split-Include, Split-Exclude and Split-Dns.');
366 366

  
367 367
$section->addInput(new Form_Checkbox(
368 368
	'strictcrlpolicy',

Also available in: Unified diff