summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-07-31 01:29:29 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-07-31 01:29:29 +0000
commite4662fc5aa1522410abb690f791cffdaeb6f29a5 (patch)
treeb470e2e6d6bc30e3a2c959e853649021bdcce2e3
parent2615fed948fe1d9c2c47a11a913881adebd89253 (diff)
downloadpfsense-e4662fc5aa1522410abb690f791cffdaeb6f29a5.zip
pfsense-e4662fc5aa1522410abb690f791cffdaeb6f29a5.tar.gz
Enable SSHD on upgrade
-rw-r--r--etc/inc/config.inc7
-rwxr-xr-xetc/sshd2
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index c1af32b..131eac0 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -653,7 +653,12 @@ function convert_config() {
/* Server NAT is no longer needed */
unset($config['nat']['servernat']);
- $config['version'] = "1.8";
+ /* enable SSH */
+ if ($config['version'] == "1.8") {
+ $config['system']['sshenabled'] = true;
+ }
+
+ $config['version'] = "1.9";
}
/* Convert 1.8 -> 1.9 */
diff --git a/etc/sshd b/etc/sshd
index 4a5c71c..4685f56 100755
--- a/etc/sshd
+++ b/etc/sshd
@@ -32,7 +32,7 @@
$stderr = fopen("php://stderr", "w");
- if(!isset($config['sshenabled']))
+ if(!isset($config['system']['sshenabled']))
exit;
function file_size($file) {
OpenPOWER on IntegriCloud