diff options
| author | Renato Botelho <renato@netgate.com> | 2015-07-17 09:51:15 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-07-17 09:55:49 -0300 |
| commit | faaab0885d68e6422885e1c3d56985992e909474 (patch) | |
| tree | 4cd110e49a7746d824c706bfff46a9ca53f71b95 /etc | |
| parent | f84945f329bc03d5b234bf9da399941dbe69220c (diff) | |
| download | pfsense-faaab0885d68e6422885e1c3d56985992e909474.zip pfsense-faaab0885d68e6422885e1c3d56985992e909474.tar.gz | |
Fix #4794:
- Add a upgrade code to fix asn1dn string format to match strongSwan needs
- Bump config version to 11.8
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 91b5ee6..3c5880b 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 c3ce9e5..188c08f 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3752,6 +3752,27 @@ function upgrade_116_to_117() { function upgrade_117_to_118() { global $config; + if (!isset($config['ipsec']['phase1'])) { + return; + } + + $a_phase1 =& $config['ipsec']['phase1']; + + foreach ($a_phase1 as &$ph1_entry) { + if (isset($ph1_entry['myid_type']) && $ph1_entry['myid_type'] == 'asn1dn') { + $ph1_entry['myid_data'] = + preg_replace('/\/\s*emailAddress\s*=\s*/', ', E=', $ph1_entry['myid_data']); + } + if (isset($ph1_entry['peerid_type']) && $ph1_entry['peerid_type'] == 'asn1dn') { + $ph1_entry['peerid_data'] = + preg_replace('/\/\s*emailAddress\s*=\s*/', ', E=', $ph1_entry['peerid_data']); + } + } +} + +function upgrade_118_to_119() { + global $config; + if (!isset($config['installedpackages']['miniupnpd']['config'][0])) { return; } @@ -3767,5 +3788,5 @@ function upgrade_117_to_118() { unset($miniupnpd["permuser{$i}"]); } } -?> +?> |
