Merge branch 'remove-ssh-allow-root' into current

* remove-ssh-allow-root:
  T634: Remove 'service ssh allow-root'

1 files changed, 1 insertions, 7 deletions

diff --git a/src/conf-mode/vyos-config-ssh.py b/src/conf-mode/vyos-config-ssh.py
index a7877eaeb..a4857bba9 100755
--- a/src/conf-mode/vyos-config-ssh.py
+++ b/src/conf-mode/vyos-config-ssh.py
@@ -59,6 +59,7 @@ Banner /etc/issue.net
 Subsystem sftp /usr/lib/openssh/sftp-server
 UsePAM yes
 HostKey /etc/ssh/ssh_host_key
+PermitRootLogin no
 
 # Specifies whether sshd should look up the remote host name,
 # and to check that the resolved host name for the remote IP
@@ -72,9 +73,6 @@ Port {{ port }}
 # Gives the verbosity level that is used when logging messages from sshd
 LogLevel {{ log_level }}
 
-# Specifies whether root can log in using ssh
-PermitRootLogin {{ allow_root }}
-
 # Specifies whether password authentication is allowed
 PasswordAuthentication {{ password_authentication }}
 
@@ -142,7 +140,6 @@ DenyGroups {{ deny_groups | join(" ") }}
 default_config_data = {
     'port' : '22',
     'log_level': 'INFO',
-    'allow_root': 'no',
     'password_authentication': 'yes',
     'host_validation': 'yes'
 }
@@ -171,9 +168,6 @@ def get_config():
         deny_groups = conf.return_values('access-control deny group')
         ssh.setdefault('deny_groups', deny_groups)
 
-    if conf.exists('allow-root'):
-        ssh['allow-root'] = 'yes'
-
     if conf.exists('ciphers'):
         ciphers = conf.return_values('ciphers')
         ssh.setdefault('ciphers', ciphers)