diff options
author | Ermal LUÇI <eri@pfsense.org> | 2015-04-03 20:11:59 +0200 |
---|---|---|
committer | Ermal LUÇI <eri@pfsense.org> | 2015-04-03 20:11:59 +0200 |
commit | 8206b2d99e344b1df102d7630f8b7af0a9772ac8 (patch) | |
tree | b9ae89598a4c742672265c91d72c6a9f38fbfc02 | |
parent | 74eaabbb2cd2e5f5099a96c9fdb3254edd4da953 (diff) | |
download | pfsense-8206b2d99e344b1df102d7630f8b7af0a9772ac8.zip pfsense-8206b2d99e344b1df102d7630f8b7af0a9772ac8.tar.gz |
Ticket #4504 actually make it correct
-rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 1e6034c..819562a 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3738,6 +3738,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'])) { @@ -3747,7 +3750,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; } function upgrade_117_to_118() { |