Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pambase:master commit in: templates/
Date: Wed, 28 Oct 2020 16:15:59
Message-Id: 1603901615.74b99b4462138ed6b496725b2499fb5d17ad9371.zlogene@gentoo
1 commit: 74b99b4462138ed6b496725b2499fb5d17ad9371
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 28 16:07:21 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 28 16:13:35 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=74b99b44
7
8 Do not use use_authtok if no passwd module was stacked
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 templates/system-auth.tpl | 5 +++++
13 1 file changed, 5 insertions(+)
14
15 diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
16 index 2ffd7ea..6edba8d 100644
17 --- a/templates/system-auth.tpl
18 +++ b/templates/system-auth.tpl
19 @@ -35,7 +35,12 @@ password required pam_pwhistory.so use_authtok remember=5 retry=3
20 password [success=1 default=ignore] pam_krb5.so {{ krb5_params }}
21 {% endif %}
22
23 +{% if passwdqc or pwquality %}
24 password required pam_unix.so try_first_pass {{ unix_authtok|default('', true) }} {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }}
25 +{% else %}
26 +password required pam_unix.so try_first_pass {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }}
27 +{% endif %}
28 +
29 password optional pam_permit.so
30
31 {% if pam_ssh %}