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:51:19 -0500 |
commit | 8691632cf7f7b2beb9b2f7b717ae199f85ea854e (patch) | |
tree | 85493011c89f4e952139198b5f905e7cceaa7e27 /etc | |
parent | 905205a2a7b5b8a7e62ba9bf76ad9d5f72170d5c (diff) | |
download | pfsense-8691632cf7f7b2beb9b2f7b717ae199f85ea854e.zip pfsense-8691632cf7f7b2beb9b2f7b717ae199f85ea854e.tar.gz |
Upgrade config to 11.9. Changes IPsec peer ID for EAP types to "any", to retain previous behavior.
Conflicts:
etc/inc/upgrade_config.inc
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index eb32435..5838cac 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3789,6 +3789,19 @@ 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"; + } + } +} + +function upgrade_119_to_120() { + global $config; + if (!isset($config['installedpackages']['miniupnpd']['config'][0])) { return; } |