Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x: (30 commits)
  smoketest: dummy: fix indent
  smoketest: bridge: bond: enable ip subsystem tests
  smoketest: interfaces: dhcpv6pd final fix
  smoketest: ethernet: fix link-speed loop test
  Debian: add build-dependency on python3-jinja2
  smoketest: ethernet: verify() speed/duplex must both be auto or discrete
  smoketest: interfaces: report skipped tests
  smoketest: ethernet: bugfixes for dhcpc6 and unknown interfaces
  Debian: add python3-psutil build dependency
  smoketest: ethernet: check for error on non existing interface
  vyos.configverify: provide generic helper to check for interface existence
  smoketest: interfaces: fix dhcpv6 pd testcase when using multiple interfaces
  login: radius: T3192: migrate to get_config_dict()
  ssh: T2635: harden Jinja2 template and daemon startup
  ssh: T2635: change sshd_config path to /run/sshd
  login: radius: T3192: support IPv6 server(s) and source-address
  xml: include: provide generic include for disable node
  xml: radius: T3192: split individual nodes to discrete includes
  bgp: T2174: verify() existence of route-map and prefix-list
  smoketest: interfaces: test dhcpv6 pd sla-id auto increment
  ...

1 files changed, 16 insertions, 15 deletions

diff --git a/data/templates/ssh/sshd_config.tmpl b/data/templates/ssh/sshd_config.tmpl
index 52d537aca..7d7257cae 100644
--- a/data/templates/ssh/sshd_config.tmpl
+++ b/data/templates/ssh/sshd_config.tmpl
@@ -27,6 +27,7 @@ Banner /etc/issue.net
 Subsystem sftp /usr/lib/openssh/sftp-server
 UsePAM yes
 PermitRootLogin no
+PidFile /run/sshd/sshd.pid
 
 #
 # User configurable section
@@ -47,59 +48,59 @@ LogLevel {{ loglevel | upper }}
 # Specifies whether password authentication is allowed
 PasswordAuthentication {{ "no" if disable_password_authentication is defined else "yes" }}
 
-{% if listen_address %}
+{% if listen_address is defined and listen_address is not none %}
 # Specifies the local addresses sshd should listen on
 {%   for address in listen_address %}
 ListenAddress {{ address }}
 {%   endfor %}
 {% endif %}
 
-{% if ciphers %}
+{% if ciphers is defined and ciphers is not none %}
 # Specifies the ciphers allowed for protocol version 2
-{% set value = ciphers if ciphers is string else ciphers | join(',') %}
+{%   set value = ciphers if ciphers is string else ciphers | join(',') %}
 Ciphers {{ value }}
 {% endif %}
 
-{% if mac %}
+{% if mac is defined and mac is not none %}
 # Specifies the available MAC (message authentication code) algorithms
-{% set value = mac if mac is string else mac | join(',') %}
+{%   set value = mac if mac is string else mac | join(',') %}
 MACs {{ value }}
 {% endif %}
 
-{% if key_exchange %}
+{% if key_exchange is defined and key_exchange is not none %}
 # Specifies the available Key Exchange algorithms
-{% set value = key_exchange if key_exchange is string else key_exchange | join(',') %}
+{%   set value = key_exchange if key_exchange is string else key_exchange | join(',') %}
 KexAlgorithms {{ value }}
 {% endif %}
 
-{% if access_control is defined %}
-{%   if access_control.allow is defined %}
+{% if access_control is defined and access_control is not none %}
+{%   if access_control.allow is defined and access_control.allow is not none %}
 {%     if access_control.allow.user is defined %}
 # If specified, login is allowed only for user names that match
-{% set value = access_control.allow.user if access_control.allow.user is string else access_control.allow.user | join(' ') %}
+{%       set value = access_control.allow.user if access_control.allow.user is string else access_control.allow.user | join(' ') %}
 AllowUsers {{ value }}
 {%     endif %}
 {%     if access_control.allow.group is defined %}
 # If specified, login is allowed only for users whose primary group or supplementary group list matches
-{% set value = access_control.allow.group if access_control.allow.group is string else access_control.allow.group | join(' ') %}
+{%       set value = access_control.allow.group if access_control.allow.group is string else access_control.allow.group | join(' ') %}
 AllowGroups {{ value }}
 {%     endif %}
 {%   endif %}
-{%   if access_control.deny is defined %}
+{%   if access_control.deny is defined and access_control.deny is not none %}
 {%     if access_control.deny.user is defined %}
 # Login is disallowed for user names that match
-{% set value = access_control.deny.user if access_control.deny.user is string else access_control.deny.user | join(' ') %}
+{%        set value = access_control.deny.user if access_control.deny.user is string else access_control.deny.user | join(' ') %}
 DenyUsers {{ value }}
 {%     endif %}
 {%     if access_control.deny.group is defined %}
 # Login is disallowed for users whose primary group or supplementary group list matches
-{% set value = access_control.deny.group if access_control.deny.group is string else access_control.deny.group | join(' ') %}
+{%        set value = access_control.deny.group if access_control.deny.group is string else access_control.deny.group | join(' ') %}
 DenyGroups {{ value }}
 {%     endif %}
 {%   endif %}
 {% endif %}
 
-{% if client_keepalive_interval %}
+{% if client_keepalive_interval is defined and client_keepalive_interval is not none %}
 # Sets a timeout interval in seconds after which if no data has been received from the client,
 # sshd(8) will send a message through the encrypted channel to request a response from the client
 ClientAliveInterval {{ client_keepalive_interval }}