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 AA1FE13835B for ; Mon, 26 Oct 2020 22:49:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DEA7E08BF; Mon, 26 Oct 2020 22:49:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6595FE08BF for ; Mon, 26 Oct 2020 22:49:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 40353340D1F for ; Mon, 26 Oct 2020 22:49:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABC6C3AA for ; Mon, 26 Oct 2020 22:49:54 +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: <1603746840.473b931a56c9387cc6a1e1eddef2260fc9f3896f.sam@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: templates/ X-VCS-Repository: proj/pambase X-VCS-Files: templates/system-auth.tpl templates/system-login.tpl X-VCS-Directories: templates/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 473b931a56c9387cc6a1e1eddef2260fc9f3896f X-VCS-Branch: master Date: Mon, 26 Oct 2020 22:49:54 +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: 10e419dc-082f-4b7a-b397-e7c24feb0f69 X-Archives-Hash: 62fed07ba654255d57481771cbe27aec commit: 473b931a56c9387cc6a1e1eddef2260fc9f3896f Author: Sam James gentoo org> AuthorDate: Mon Oct 26 08:33:23 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 26 21:14:00 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=473b931a templates/system-login.tpl: always need faillock Fixes: eb138196aa2d3cb860d5eb5ab1d05985df34ad2c Signed-off-by: Sam James gentoo.org> templates/system-auth.tpl | 2 -- templates/system-login.tpl | 2 -- 2 files changed, 4 deletions(-) diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index faf18ee..8b61701 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -17,9 +17,7 @@ account [success=1 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} account required pam_unix.so {{ debug|default('', true) }} account optional pam_permit.so -{% if not minimal %} account required pam_faillock.so -{% endif %} {% if passwdqc %} password required pam_passwdqc.so config=/etc/security/passwdqc.conf diff --git a/templates/system-login.tpl b/templates/system-login.tpl index 889c2d7..6a0d544 100644 --- a/templates/system-login.tpl +++ b/templates/system-login.tpl @@ -5,9 +5,7 @@ auth include system-auth account required pam_access.so {{ debug|default('', true) }} account required pam_nologin.so account include system-auth -{% if not minimal %} account required pam_faillock.so -{% endif %} password include system-auth session optional pam_loginuid.so