From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AD2F138359 for ; Wed, 28 Oct 2020 16:15:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BB45E07A5; Wed, 28 Oct 2020 16:15:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75946E07A5 for ; Wed, 28 Oct 2020 16:15:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DC1D335C9C for ; Wed, 28 Oct 2020 16:15:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A7293B5 for ; Wed, 28 Oct 2020 16:15:56 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1603901615.74b99b4462138ed6b496725b2499fb5d17ad9371.zlogene@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: templates/ X-VCS-Repository: proj/pambase X-VCS-Files: templates/system-auth.tpl X-VCS-Directories: templates/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 74b99b4462138ed6b496725b2499fb5d17ad9371 X-VCS-Branch: master Date: Wed, 28 Oct 2020 16:15:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c827b18c-9908-428b-bd57-8cfd3361a0c2 X-Archives-Hash: 9f6e8ced22e989d42e466a0d14ab4534 commit: 74b99b4462138ed6b496725b2499fb5d17ad9371 Author: Mikle Kolyada gentoo org> AuthorDate: Wed Oct 28 16:07:21 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Wed Oct 28 16:13:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=74b99b44 Do not use use_authtok if no passwd module was stacked Signed-off-by: Mikle Kolyada gentoo.org> templates/system-auth.tpl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 2ffd7ea..6edba8d 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -35,7 +35,12 @@ password required pam_pwhistory.so use_authtok remember=5 retry=3 password [success=1 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} +{% if passwdqc or pwquality %} password required pam_unix.so try_first_pass {{ unix_authtok|default('', true) }} {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }} +{% else %} +password required pam_unix.so try_first_pass {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }} +{% endif %} + password optional pam_permit.so {% if pam_ssh %}