summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2015-11-22 09:45:24 -0600
committerLuiz Otavio O Souza <luiz@netgate.com>2015-11-22 09:45:24 -0600
commit8d48b23f4b119f6c8061f6c7f1b2e3682446551e (patch)
tree7a5bbac0f47de033b3563dd6085bc58b169b4c56 /src
parentfef38e5aa049a4aef6ce5188f1db9c92ffb0969b (diff)
downloadpfsense-8d48b23f4b119f6c8061f6c7f1b2e3682446551e.zip
pfsense-8d48b23f4b119f6c8061f6c7f1b2e3682446551e.tar.gz
When necessary, unset $config['ipsec']['enable'] in upgrade code.
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/upgrade_config.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 889cbdc..41a09d8 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4114,6 +4114,9 @@ function upgrade_127_to_128() {
unset($config['snmpd']['bindlan']);
}
+ /* IPSEC is always on in 2.3. */
+ if (isset($config['ipsec']['enable']))
+ unset($config['ipsec']['enable']);
}
?>
OpenPOWER on IntegriCloud