[gentoo-commits] proj/pambase:master commit in: /

[Sam James]

commit:     f28eb0e9d1f9d46d6d4d17164a1ed98461c2a377
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 15:25:20 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 15:27:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/pambase.git/commit/?id=f28eb0e9

templates/system-login.tpl: remove duplicate block from system-auth (again)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 templates/system-auth.tpl  | 5 -----
 templates/system-login.tpl | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --cc templates/system-auth.tpl
index f8484f1,1bb53ae..11319d6
--- a/templates/system-auth.tpl
+++ b/templates/system-auth.tpl
@@@ -9,11 -9,11 +9,6 @@@ auth        [success=1 default=ignore
  
  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 silent audit deny=3 
unlock_time=600
 -auth            required        pam_faillock.so preauth 
conf=/etc/security/faillock.conf
--auth            sufficient      pam_unix.so {{ nullok|default('', true) }} 
try_first_pass
- auth            [default=die]   pam_faillock.so authfail audit deny=3 
unlock_time=600
 -auth            [default=die]   pam_faillock.so authfail
--{% endif %}
  
  {% if krb5 %}
  account               [success=1 default=ignore]      pam_krb5.so {{ 
krb5_params }}
diff --cc templates/system-login.tpl
index 889c2d7,bb4f093..25843f5
--- a/templates/system-login.tpl
+++ b/templates/system-login.tpl
@@@ -1,7 -1,12 +1,13 @@@
  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