From 024e5de242661219bb8a62f183b1601cec44aa3c Mon Sep 17 00:00:00 2001
From: jim-p <jimp@netgate.com>
Date: Wed, 31 Oct 2018 12:59:03 -0400
Subject: [PATCH] Skip empty IPsec P1 during upgrade to 17.5. Fixes #9083

---
 src/etc/inc/upgrade_config.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index f8e2500c1a..0f22794922 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'];