From 368d491073eecbb3ff89e016c4308ca5bad86860 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Wed, 31 Dec 2014 12:54:23 -0200 Subject: Add config upgrade code to make sure iketype is set, bump config version to 11.4. It fixes #4163 --- etc/inc/globals.inc | 2 +- etc/inc/upgrade_config.inc | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'etc/inc') diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 1d7e04d..f991491 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -73,7 +73,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "11.3", + "latest_config" => "11.4", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index e9e77cc..956b2ec 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3519,4 +3519,16 @@ function upgrade_112_to_113() { unset($config['notifications']['smtp']['tls']); } +function upgrade_113_to_114() { + global $config; + + if (!isset($config['ipsec']['phase1']) || + !is_array($config['ipsec']['phase1'])) + return; + + foreach($config['ipsec']['phase1'] as &$ph1ent) + if (!isset($ph1ent['iketype'])) + $ph1ent['iketype'] = 'ikev1'; +} + ?> -- cgit v1.1