From 76ca1bc50e9c2fac22ca4cd327728225fe99e363 Mon Sep 17 00:00:00 2001
From: Steve Beaver <sbeaver@netgate.com>
Date: Fri, 2 Feb 2018 15:41:59 -0500
Subject: [PATCH] Fix config version # arrising from merging older PR

---
 src/etc/inc/globals.inc        | 2 +-
 src/etc/inc/upgrade_config.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index 5769278adf..c1cf19c6b9 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -74,7 +74,7 @@ $g = array(
 	"disablecrashreporter" => false,
 	"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
 	"debug" => false,
-	"latest_config" => "17.4",
+	"latest_config" => "17.5",
 	"minimum_ram_warning" => "101",
 	"minimum_ram_warning_text" => "128 MB",
 	"wan_interface_name" => "wan",
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 91d9a3bc0e..b6d854736d 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -5493,7 +5493,7 @@ function additional_config_upgrade() {
 /* IPsec Phase1 now supports multiple authentication ciphers to be specified from the webgui.
  * This is usefull for mobile users using different OS's supporting different ciphers.
  */
-function upgrade_173_to_174() {
+function upgrade_174_to_175() {
 	global $config;
 	if (is_array($config['ipsec']['phase1'])) {
 		$a_phase1 = &$config['ipsec']['phase1'];
@@ -5502,7 +5502,7 @@ function upgrade_173_to_174() {
 			$item['encryption-algorithm'] = $phase1['encryption-algorithm'];
 			$item['hash-algorithm'] = $phase1['hash-algorithm'];
 			$item['dhgroup'] = $phase1['dhgroup'];
-			$phase1['encryption']['item'][] = $item;	
+			$phase1['encryption']['item'][] = $item;
 			unset($phase1['encryption-algorithm']);
 			unset($phase1['hash-algorithm']);
 			unset($phase1['dhgroup']);