From f635d8d873056e7cb705ae5344cfeb0bc6748418 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 9 Aug 2017 14:27:51 +0200
Subject: [PATCH] openssh: flip-flop, enabled always wins #1750

---
 src/etc/inc/plugins.inc.d/openssh.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/openssh.inc b/src/etc/inc/plugins.inc.d/openssh.inc
index 131b9f7c0..a95f6e1ad 100644
--- a/src/etc/inc/plugins.inc.d/openssh.inc
+++ b/src/etc/inc/plugins.inc.d/openssh.inc
@@ -71,11 +71,11 @@ function openssh_configure_do($verbose = false)
 
     $sshcfg = null;
 
-    if (!isset($config['system']['ssh']['noauto']) && is_install_media()) {
+    if (isset($config['system']['ssh']['enabled'])) {
+        $sshcfg = $config['system']['ssh'];
+    } elseif (!isset($config['system']['ssh']['noauto']) && is_install_media()) {
         /* only revert to installer config when ssh is not set at all */
         $sshcfg = array('permitrootlogin' => 1, 'passwordauth' => 1);
-    } elseif (isset($config['system']['ssh']['enabled'])) {
-        $sshcfg = $config['system']['ssh'];
     }
 
     if ($sshcfg === null) {