summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-04-03 20:11:59 +0200
committerErmal LUÇI <eri@pfsense.org>2015-04-03 20:12:07 +0200
commit3d48d3c54bab9cfafab0a7d98aa69717cd9cd187 (patch)
treec9fb5e9cf318f6dd559aa4acdd5ea3e9b612323f /etc
parent5a2ebbb1e5669b3734c11382db50b98889cf9b59 (diff)
downloadpfsense-3d48d3c54bab9cfafab0a7d98aa69717cd9cd187.zip
pfsense-3d48d3c54bab9cfafab0a7d98aa69717cd9cd187.tar.gz
Ticket #4504 actually make it correct
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/upgrade_config.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index cd5fd00..377e458 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;
}
?>
OpenPOWER on IntegriCloud