Skip empty IPsec P1 during upgrade to 17.5. Fixes #9083

(cherry picked from commit 024e5de)
jzadir · Oct 31, 2018 · 1f7ea9c · 1f7ea9c
1 parent 087a1f6
commit 1f7ea9c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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'];