diff options
author | Ermal <eri@pfsense.org> | 2010-06-23 18:35:49 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-06-23 18:35:49 +0000 |
commit | 56c9163122699bcf9e2487af0d0df13df5421d20 (patch) | |
tree | a6a50bcfe911d4af036f31584866fb77c77e228c | |
parent | 2e591a5db12e188ccff9ad6c53a0002075f9f053 (diff) | |
download | pfsense-56c9163122699bcf9e2487af0d0df13df5421d20.zip pfsense-56c9163122699bcf9e2487af0d0df13df5421d20.tar.gz |
Pass correct argument to killbyname and correctly check for sshdkeyonly toggle. Ticket #691
-rwxr-xr-x | etc/sshd | 2 | ||||
-rw-r--r-- | usr/local/www/system_advanced_admin.php | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -94,7 +94,7 @@ $sshconf .= "ClientAliveInterval 30\n"; $sshconf .= "UseDNS no\n"; $sshconf .= "X11Forwarding no\n"; - if($config['system']['ssh']['sshdkeyonly'] <> "") { + if(isset($config['system']['ssh']['sshdkeyonly'])) { $sshconf .= "# Login via Key only\n"; $sshconf .= "PasswordAuthentication no\n"; $sshconf .= "ChallengeResponseAuthentication no\n"; diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index ca4cee3..bfa5061 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -412,7 +412,7 @@ function prot_change() { <?php if ($restart_sshd) { - killbyname(sshd); + killbyname("sshd"); log_error(gettext("secure shell configuration has changed. Stopping sshd.")); if ($config['system']['enablesshd']) { |