commit: abca630446236ddf83c7686ca8742b305bf8a050
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 15:30:28 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 15:30:28 2020 +0000
URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=abca6304
templates/system-login.tpl: remove duplicate block already in system-auth
Do it right this time!
Signed-off-by: Sam James <sam <AT> gentoo.org>
templates/system-auth.tpl | 5 +++++
templates/system-login.tpl | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
index 11319d6..557da9b 100644
--- a/templates/system-auth.tpl
+++ b/templates/system-auth.tpl
@@ -9,6 +9,11 @@ auth [success=1 default=ignore] pam_krb5.so {{
krb5_params }}
auth required pam_unix.so try_first_pass {{ likeauth }} {{
nullok|default('', true) }} {{ debug|default('', true) }}
auth optional pam_permit.so
+{% if not minimal %}
+auth required pam_faillock.so preauth
conf=/etc/security/faillock.conf
+auth sufficient pam_unix.so nullok try_first_pass
+auth [default=die] pam_faillock.so authfail
+{% endif %}
{% if krb5 %}
account [success=1 default=ignore] pam_krb5.so {{
krb5_params }}
diff --git a/templates/system-login.tpl b/templates/system-login.tpl
index 25843f5..889c2d7 100644
--- a/templates/system-login.tpl
+++ b/templates/system-login.tpl
@@ -2,12 +2,6 @@ auth required pam_shells.so {{
debug|default('', true) }}
auth required pam_nologin.so
auth include system-auth
-{% if not minimal %}
-auth required pam_faillock.so preauth
conf=/etc/security/faillock.conf
-auth sufficient pam_unix.so nullok try_first_pass
-auth [default=die] pam_faillock.so authfail
-{% endif %}
-
account required pam_access.so {{ debug|default('',
true) }}
account required pam_nologin.so
account include system-auth
