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 6AC9A138359 for ; Tue, 20 Oct 2020 02:38:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9247AE081E; Tue, 20 Oct 2020 02:38:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3DF61E081E for ; Tue, 20 Oct 2020 02:38:52 +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 1C21F340B81 for ; Tue, 20 Oct 2020 02:38:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8229F398 for ; Tue, 20 Oct 2020 02:38:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1603161500.eb138196aa2d3cb860d5eb5ab1d05985df34ad2c.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eb138196aa2d3cb860d5eb5ab1d05985df34ad2c X-VCS-Branch: master Date: Tue, 20 Oct 2020 02:38:48 +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: 8fe6e25c-37b7-4b77-8934-18e51187f57c X-Archives-Hash: 66068fc9347cad9511e076e41181f099 commit: eb138196aa2d3cb860d5eb5ab1d05985df34ad2c Author: Sam James gentoo org> AuthorDate: Tue Oct 20 02:32:28 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 20 02:38:20 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=eb138196 templates/system-auth.tpl: use faillock in minimal case Bug: https://bugs.gentoo.org/748405 Signed-off-by: Sam James gentoo.org> templates/system-auth.tpl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index bc28468..faf18ee 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -7,13 +7,10 @@ auth sufficient pam_ssh.so auth [success=1 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} -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 -auth sufficient pam_unix.so nullok try_first_pass +auth requisite pam_faillock.so preauth +auth [success=1 default=ignore] pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} try_first_pass auth [default=die] pam_faillock.so authfail -{% endif %} {% if krb5 %} account [success=1 default=ignore] pam_krb5.so {{ krb5_params }}