diff options
| author | jim-p <jimp@netgate.com> | 2018-10-31 12:59:03 -0400 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2018-10-31 12:59:34 -0400 |
| commit | 1f7ea9ce2c18cc61060508fe0d27d089249be204 (patch) | |
| tree | 9f986262a681fbd340ae77e2dc91eeeb5bfdb5c2 /src/etc | |
| parent | 087a1f6b5fe5a5e1dc6ec95934f0931e32cf6b27 (diff) | |
| download | pfsense-1f7ea9ce2c18cc61060508fe0d27d089249be204.zip pfsense-1f7ea9ce2c18cc61060508fe0d27d089249be204.tar.gz | |
Skip empty IPsec P1 during upgrade to 17.5. Fixes #9083
(cherry picked from commit 024e5de242661219bb8a62f183b1601cec44aa3c)
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index f8e2500..0f22794 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -5489,9 +5489,13 @@ function upgrade_173_to_174() { */ function upgrade_174_to_175() { global $config; + init_config_arr(array('ipsec', 'phase1')); if (is_array($config['ipsec']['phase1'])) { $a_phase1 = &$config['ipsec']['phase1']; foreach($a_phase1 as &$phase1) { + if (empty($phase1)) { + continue; + } $item = array(); $item['encryption-algorithm'] = $phase1['encryption-algorithm']; $item['hash-algorithm'] = $phase1['hash-algorithm']; |
