summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-07-21 21:18:30 +0545
committerPhil Davis <phil.davis@inf.org>2015-07-21 21:18:30 +0545
commit661de3e7923ccc5e63fc50671464624cf421ff33 (patch)
tree0472b97e52f46dff159064d86b43cc5edbb027ae /etc
parent775b46fa4ba93e1f076b0593e1045560b48ab925 (diff)
downloadpfsense-661de3e7923ccc5e63fc50671464624cf421ff33.zip
pfsense-661de3e7923ccc5e63fc50671464624cf421ff33.tar.gz
Unset old CA and Cert in system config
This looked odd. Why would we leave behind the old "ca" and "cert" section in $config["system"]? I guess it would do no harm, but seems confusing for the future to have some unused entries like this remaining in the config. Should a piece of code be put into the latest upgrade function to clean out these in any current config?
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/upgrade_config.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 188c08f..596088a 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']);
}
}
OpenPOWER on IntegriCloud