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 463F6138359 for ; Mon, 12 Oct 2020 15:32:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 913E9E0923; Mon, 12 Oct 2020 15:32:10 +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 799ABE0923 for ; Mon, 12 Oct 2020 15:32:10 +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 9D68E335C71 for ; Mon, 12 Oct 2020 15:32:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4015A37F for ; Mon, 12 Oct 2020 15:32:06 +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: <1602516628.abca630446236ddf83c7686ca8742b305bf8a050.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: abca630446236ddf83c7686ca8742b305bf8a050 X-VCS-Branch: master Date: Mon, 12 Oct 2020 15:32:06 +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: 6a4012c2-401b-4ce1-b650-8d0ca326f64f X-Archives-Hash: 5022428b027823270b3ba095903412e6 commit: abca630446236ddf83c7686ca8742b305bf8a050 Author: Sam James gentoo org> AuthorDate: Mon Oct 12 15:30:28 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 12 15:30:28 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=abca6304 templates/system-login.tpl: remove duplicate block already in system-auth Do it right this time! Signed-off-by: Sam James gentoo.org> templates/system-auth.tpl | 5 +++++ templates/system-login.tpl | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 11319d6..557da9b 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -9,6 +9,11 @@ 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 sufficient pam_unix.so nullok try_first_pass +auth [default=die] pam_faillock.so authfail +{% endif %} {% if krb5 %} account [success=1 default=ignore] pam_krb5.so {{ krb5_params }} diff --git a/templates/system-login.tpl b/templates/system-login.tpl index 25843f5..889c2d7 100644 --- a/templates/system-login.tpl +++ b/templates/system-login.tpl @@ -2,12 +2,6 @@ auth required pam_shells.so {{ debug|default('', true) }} auth required pam_nologin.so auth include system-auth -{% if not minimal %} -auth required pam_faillock.so preauth conf=/etc/security/faillock.conf -auth sufficient pam_unix.so nullok try_first_pass -auth [default=die] pam_faillock.so authfail -{% endif %} - account required pam_access.so {{ debug|default('', true) }} account required pam_nologin.so account include system-auth