1 |
commit: f28eb0e9d1f9d46d6d4d17164a1ed98461c2a377 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 12 15:25:20 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 12 15:27:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=f28eb0e9 |
7 |
|
8 |
templates/system-login.tpl: remove duplicate block from system-auth (again) |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
templates/system-auth.tpl | 5 ----- |
13 |
templates/system-login.tpl | 6 ++++++ |
14 |
2 files changed, 6 insertions(+), 5 deletions(-) |
15 |
|
16 |
diff --cc templates/system-auth.tpl |
17 |
index f8484f1,1bb53ae..11319d6 |
18 |
--- a/templates/system-auth.tpl |
19 |
+++ b/templates/system-auth.tpl |
20 |
@@@ -9,11 -9,11 +9,6 @@@ auth [success=1 default=ignore |
21 |
|
22 |
auth required pam_unix.so try_first_pass {{ likeauth }} {{ nullok|default('', true) }} {{ debug|default('', true) }} |
23 |
auth optional pam_permit.so |
24 |
--{% if not minimal %} |
25 |
- auth required pam_faillock.so preauth silent audit deny=3 unlock_time=600 |
26 |
-auth required pam_faillock.so preauth conf=/etc/security/faillock.conf |
27 |
--auth sufficient pam_unix.so {{ nullok|default('', true) }} try_first_pass |
28 |
- auth [default=die] pam_faillock.so authfail audit deny=3 unlock_time=600 |
29 |
-auth [default=die] pam_faillock.so authfail |
30 |
--{% endif %} |
31 |
|
32 |
{% if krb5 %} |
33 |
account [success=1 default=ignore] pam_krb5.so {{ krb5_params }} |
34 |
diff --cc templates/system-login.tpl |
35 |
index 889c2d7,bb4f093..25843f5 |
36 |
--- a/templates/system-login.tpl |
37 |
+++ b/templates/system-login.tpl |
38 |
@@@ -1,7 -1,12 +1,13 @@@ |
39 |
auth required pam_shells.so {{ debug|default('', true) }} |
40 |
auth required pam_nologin.so |
41 |
auth include system-auth |
42 |
+ |
43 |
+ {% if not minimal %} |
44 |
+ auth required pam_faillock.so preauth conf=/etc/security/faillock.conf |
45 |
+ auth sufficient pam_unix.so nullok try_first_pass |
46 |
+ auth [default=die] pam_faillock.so authfail |
47 |
+ {% endif %} |
48 |
+ |
49 |
account required pam_access.so {{ debug|default('', true) }} |
50 |
account required pam_nologin.so |
51 |
account include system-auth |