diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-07-23 15:02:39 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-07-23 15:02:39 -0500 |
| commit | e7f4a96432c1844a4a7806cf6b11ccc3bef8a6f9 (patch) | |
| tree | e33ff3a300298f076b954dab19769ba99fb4ec22 /etc/inc/upgrade_config.inc | |
| parent | 47f802694a1e1dfbbd011d7ec431c0948358b5c3 (diff) | |
| download | pfsense-e7f4a96432c1844a4a7806cf6b11ccc3bef8a6f9.zip pfsense-e7f4a96432c1844a4a7806cf6b11ccc3bef8a6f9.tar.gz | |
change iketype auto to ikev2 on upgrade. Ticket #4873
Diffstat (limited to 'etc/inc/upgrade_config.inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 11430d0..f622b1f 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3585,6 +3585,7 @@ function upgrade_117_to_118() { $a_phase1 =& $config['ipsec']['phase1']; foreach ($a_phase1 as &$ph1_entry) { + // update asn1dn strings from racoon's format to strongswan's 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']); @@ -3593,6 +3594,10 @@ function upgrade_117_to_118() { $ph1_entry['peerid_data'] = preg_replace('/\/\s*emailAddress\s*=\s*/', ', E=', $ph1_entry['peerid_data']); } + // iketype 'auto' was removed and is really v2, update accordingly + if ($ph1_entry['iketype'] == "auto") { + $ph1_entry['iketype'] = "ikev2"; + } } } |
