Merge pull request #80 from llua/use_pam

do not set UsePAM on OpenBSD
This commit is contained in:
Florian Ermisch 2017-01-15 12:04:07 +01:00 committed by GitHub
commit bff3e5d199

View File

@ -134,6 +134,7 @@
{{ option_default_uncommented('Subsystem', 'sftp /usr/lib/openssh/sftp-server') }} {{ option_default_uncommented('Subsystem', 'sftp /usr/lib/openssh/sftp-server') }}
{% if not salt['grains.get']('os') == 'OpenBSD' -%}
# Set this to 'yes' to enable PAM authentication, account processing, # Set this to 'yes' to enable PAM authentication, account processing,
# and session processing. If this is enabled, PAM authentication will # and session processing. If this is enabled, PAM authentication will
# be allowed through the ChallengeResponseAuthentication and # be allowed through the ChallengeResponseAuthentication and
@ -144,6 +145,7 @@
# PAM authentication, then enable this but set PasswordAuthentication # PAM authentication, then enable this but set PasswordAuthentication
# and ChallengeResponseAuthentication to 'no'. # and ChallengeResponseAuthentication to 'no'.
{{ option_default_uncommented('UsePAM', 'yes') }} {{ option_default_uncommented('UsePAM', 'yes') }}
{%- endif %}
# DNS resolve and map remote IP addresses # DNS resolve and map remote IP addresses
{{ option('UseDNS', 'yes') }} {{ option('UseDNS', 'yes') }}