diff options
author | Chris Buechler <cmb@pfsense.org> | 2015-07-21 19:25:20 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2015-07-21 19:25:20 -0500 |
commit | 909d9ec10b4b5e2f2bf417ae545003888bf4c723 (patch) | |
tree | a5d8684fa6e1a2bf087da1178d78932ad08e9b8b /etc | |
parent | 0ec6cc29006d0978e348e4393c4cf9ac89eddad3 (diff) | |
parent | 564f135646c66fb3a051fb6d076ba8afd568cd0b (diff) | |
download | pfsense-909d9ec10b4b5e2f2bf417ae545003888bf4c723.zip pfsense-909d9ec10b4b5e2f2bf417ae545003888bf4c723.tar.gz |
Merge pull request #1770 from phil-davis/patch-1
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index f2175ff..10c3ff9 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2547,9 +2547,11 @@ function upgrade_066_to_067() { global $config; if (isset($config['system']['ca'])) { $config['ca'] = $config['system']['ca']; + unset($config['system']['ca']); } if (isset($config['system']['cert'])) { $config['cert'] = $config['system']['cert']; + unset($config['system']['cert']); } } @@ -3753,6 +3755,14 @@ function upgrade_116_to_117() { function upgrade_117_to_118() { global $config; + // Unset any old CA and Cert in the system section that might still be there from when upgrade_066_to_067 did not unset them. + if (isset($config['system']['ca'])) { + unset($config['system']['ca']); + } + if (isset($config['system']['cert'])) { + unset($config['system']['cert']); + } + if (!isset($config['ipsec']['phase1'])) { return; } |