diff options
| author | jim-p <jimp@netgate.com> | 2018-10-10 13:04:43 -0400 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2018-10-10 13:04:53 -0400 |
| commit | 2f5aef4ea688e441c8f913d55f545f5fefbdbae1 (patch) | |
| tree | 974f181a2fda607de77d20881dacc403ba169bd8 | |
| parent | b1862963068907f193a3a88e8f25177aeaf53a9f (diff) | |
| download | pfsense-2f5aef4ea688e441c8f913d55f545f5fefbdbae1.zip pfsense-2f5aef4ea688e441c8f913d55f545f5fefbdbae1.tar.gz | |
ssh settings upgrade fixes
(cherry picked from commit 72b7b9a20e43e644035e44bd28b13f4e4bd775a5)
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 9ce7e6d..f8e2500 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -5924,13 +5924,14 @@ function upgrade_188_to_189() { /* Migrate ssh setting to new location */ if (isset($config['system']['enablesshd'])) { + init_config_arr(array('system', 'ssh')); $config['system']['ssh']['enable'] = "enabled"; unset($config['system']['enablesshd']); } /* Remove accidentally duplicated ssh config * See https://redmine.pfsense.org/issues/8974 */ if (isset($config['system']['sshd'])) { - $config['system']['sshd']; + unset($config['system']['sshd']); } } |
