diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-07-21 23:50:44 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-07-21 23:50:44 +0545 |
| commit | 564f135646c66fb3a051fb6d076ba8afd568cd0b (patch) | |
| tree | 873c08668ec19676dce46596ff90bfd4d85cc1ea | |
| parent | 661de3e7923ccc5e63fc50671464624cf421ff33 (diff) | |
| download | pfsense-564f135646c66fb3a051fb6d076ba8afd568cd0b.zip pfsense-564f135646c66fb3a051fb6d076ba8afd568cd0b.tar.gz | |
Unset old CA and Cert in left system 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. That will tidy up old configs that had the conversion done originally but these old sections were left behind.
| -rw-r--r-- | etc/inc/upgrade_config.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 596088a..267c0d6 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3754,6 +3754,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; } |
