From 0692e3ce596f812eb72f1eab1b99faa792d6aa0b Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 8 Aug 2017 17:50:11 +0200 Subject: [PATCH] src: more for previous, just restart unconditionally #1750 --- src/www/system_advanced_admin.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php index 443de32fc..4c3b9ee31 100644 --- a/src/www/system_advanced_admin.php +++ b/src/www/system_advanced_admin.php @@ -199,11 +199,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { /* always store ssh setting to prevent install scenario */ $config['system']['ssh']['reserved'] = 1; - $restart_ssh = empty($config['system']['ssh']['enabled']) != empty($pconfig['enablesshd']) || - empty($config['system']['ssh']['passwordauth']) != empty($pconfig['passwordauth']) || - empty($config['system']['ssh']['port']) != !empty($pconfig['sshport']) || - empty($config['system']['ssh']['permitrootlogin']) != empty($pconfig['sshdpermitrootlogin']); - if (!empty($pconfig['enablesshd'])) { $config['system']['ssh']['enabled'] = 'enabled'; } elseif (isset($config['system']['ssh']['enabled'])) { @@ -266,10 +261,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { system_hosts_generate(); plugins_configure('dns'); services_dhcpd_configure(); - - if ($restart_sshd) { - configd_run('openssh restart', true); - } + configd_run('openssh restart', true); if ($restart_webgui) { mwexec_bg('/usr/local/etc/rc.restart_webgui 2');