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 F37CD138359 for ; Mon, 12 Oct 2020 17:30:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47F90E075F; Mon, 12 Oct 2020 17:30:54 +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 2E0C5E075F for ; Mon, 12 Oct 2020 17:30:54 +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 817F333BEE8 for ; Mon, 12 Oct 2020 17:30:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8A7C332 for ; Mon, 12 Oct 2020 17:30:50 +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: <1602523818.e0835e729bcf04f501d4610cf3925ec41b37c5f5.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: e0835e729bcf04f501d4610cf3925ec41b37c5f5 X-VCS-Branch: master Date: Mon, 12 Oct 2020 17:30:50 +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: 645850c2-5de0-4aca-b684-383d4e038361 X-Archives-Hash: 699dc3bc5e379f5bb73337fea421bebe commit: e0835e729bcf04f501d4610cf3925ec41b37c5f5 Author: Sam James gentoo org> AuthorDate: Mon Oct 12 17:30:18 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 12 17:30:18 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=e0835e72 templates/system-auth.tpl: drop superfluous conf param on faillock pam_faillock defaults to /etc/security/faillock.conf anyway. Closes: https://bugs.gentoo.org/747967 Signed-off-by: Sam James gentoo.org> templates/system-auth.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 557da9b..bc28468 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -10,7 +10,7 @@ auth [success=1 default=ignore] pam_krb5.so {{ krb5_params }} 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 conf=/etc/security/faillock.conf +auth required pam_faillock.so preauth auth sufficient pam_unix.so nullok try_first_pass auth [default=die] pam_faillock.so authfail {% endif %}