| 1 |
commit: abca630446236ddf83c7686ca8742b305bf8a050 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 12 15:30:28 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 12 15:30:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=abca6304 |
| 7 |
|
| 8 |
templates/system-login.tpl: remove duplicate block already in system-auth |
| 9 |
|
| 10 |
Do it right this time! |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
templates/system-auth.tpl | 5 +++++ |
| 15 |
templates/system-login.tpl | 6 ------ |
| 16 |
2 files changed, 5 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl |
| 19 |
index 11319d6..557da9b 100644 |
| 20 |
--- a/templates/system-auth.tpl |
| 21 |
+++ b/templates/system-auth.tpl |
| 22 |
@@ -9,6 +9,11 @@ auth [success=1 default=ignore] pam_krb5.so {{ krb5_params }} |
| 23 |
|
| 24 |
auth required pam_unix.so try_first_pass {{ likeauth }} {{ nullok|default('', true) }} {{ debug|default('', true) }} |
| 25 |
auth optional pam_permit.so |
| 26 |
+{% if not minimal %} |
| 27 |
+auth required pam_faillock.so preauth conf=/etc/security/faillock.conf |
| 28 |
+auth sufficient pam_unix.so nullok try_first_pass |
| 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 |
|
| 35 |
diff --git a/templates/system-login.tpl b/templates/system-login.tpl |
| 36 |
index 25843f5..889c2d7 100644 |
| 37 |
--- a/templates/system-login.tpl |
| 38 |
+++ b/templates/system-login.tpl |
| 39 |
@@ -2,12 +2,6 @@ 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 |
Archives