diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-07-25 19:41:31 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-07-25 19:41:31 -0500 |
| commit | 5e11c6a176d70f1caa987e64a01a8f996b18aad7 (patch) | |
| tree | 257b82129d9d95418b6c27a463d4219992ab896d | |
| parent | c6354005bb6e57688699e5acf847cff134ded750 (diff) | |
| download | pfsense-5e11c6a176d70f1caa987e64a01a8f996b18aad7.zip pfsense-5e11c6a176d70f1caa987e64a01a8f996b18aad7.tar.gz | |
Upgrade config to 11.9. Changes IPsec peer ID for EAP types to "any", to retain previous behavior.
| -rw-r--r-- | conf.default/config.xml | 2 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 13 |
3 files changed, 15 insertions, 2 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index 6a6da59..8979fc3 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>11.8</version> + <version>11.9</version> <lastchange/> <theme>pfsense_ng</theme> <system> diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 7a8a09a..f7aaf7b 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -74,7 +74,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "11.8", + "latest_config" => "11.9", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index f622b1f..909d46f 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3601,4 +3601,17 @@ function upgrade_117_to_118() { } } +function upgrade_118_to_119() { + global $config; + + // change peerid_type to 'any' for EAP types to retain previous behavior of omitting rightid + $a_phase1 =& $config['ipsec']['phase1']; + + foreach ($a_phase1 as &$ph1_entry) { + if (strstr($ph1_entry['authentication_method'], 'eap')) { + $ph1_entry['peerid_type'] = "any"; + } + } +} + ?> |
