diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-12-31 12:54:23 -0200 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-31 12:54:34 -0200 |
commit | 16a0f33446b3fffc6783803fad56f3b71eceb78c (patch) | |
tree | 071a7abd0fa4ec2236a033d1b401c6cfb2d08f09 /etc | |
parent | 7cb2ebe7550ca328661ec12f380d4dc43b71dd30 (diff) | |
download | pfsense-16a0f33446b3fffc6783803fad56f3b71eceb78c.zip pfsense-16a0f33446b3fffc6783803fad56f3b71eceb78c.tar.gz |
Add config upgrade code to make sure iketype is set, bump config version to 11.4. It fixes #4163
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/globals.inc | 2 | ||||
-rw-r--r-- | etc/inc/upgrade_config.inc | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 1aef692..ae7352f 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'; +} + ?> |