From 3d48d3c54bab9cfafab0a7d98aa69717cd9cd187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20LU=C3=87I?= <eri@pfsense.org>
Date: Fri, 3 Apr 2015 20:11:59 +0200
Subject: [PATCH] Ticket #4504 actually make it correct

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

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index cd5fd00df1..377e458742 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3555,6 +3555,9 @@ function upgrade_115_to_116() {
 function upgrade_116_to_117() {
 	global $config;
 
+	if (is_array($config['ipsec']))
+		$config['ipsec']['shuntlaninterfaces'] = true;
+
 	if (!isset($config['ipsec']['client']) ||
 	    !isset($config['ipsec']['client']['dns_split']) ||
 	    empty($config['ipsec']['client']['dns_split'])) {
@@ -3564,7 +3567,6 @@ function upgrade_116_to_117() {
 	$config['ipsec']['client']['dns_split'] =
 		preg_replace('/\s*,\s*/', ' ', trim($config['ipsec']['client']['dns_split']));
 
-	$config['ipsec']['shuntlaninterfaces'] = true;
 }
 
 ?>