summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-07-21 23:50:44 +0545
committerChris Buechler <cmb@pfsense.org>2015-07-21 19:25:40 -0500
commit8c378f3fd259138657d246c76e00214eebb9090f (patch)
tree7451ee721cb49aeff497ce96eaf437be3f87293f
parentebd900f94638208c295154b5a93222e903267f31 (diff)
downloadpfsense-8c378f3fd259138657d246c76e00214eebb9090f.zip
pfsense-8c378f3fd259138657d246c76e00214eebb9090f.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.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index c622830..11430d0 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3570,6 +3570,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;
}
OpenPOWER on IntegriCloud