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 8094E13835B for ; Mon, 12 Oct 2020 15:28:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DB47E08BB; Mon, 12 Oct 2020 15:28:03 +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 84000E08AD for ; Mon, 12 Oct 2020 15:28:03 +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 B3B7F33BDE5 for ; Mon, 12 Oct 2020 15:28:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C60B3A1 for ; Mon, 12 Oct 2020 15:28:01 +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: <1602516474.f28eb0e9d1f9d46d6d4d17164a1ed98461c2a377.sam@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: / X-VCS-Repository: proj/pambase X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f28eb0e9d1f9d46d6d4d17164a1ed98461c2a377 X-VCS-Branch: master Date: Mon, 12 Oct 2020 15:28:01 +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: 6c961851-bd7e-4faa-a775-f068de8215b5 X-Archives-Hash: 203e25168e5f42428dfa3e6fc6df76cc commit: f28eb0e9d1f9d46d6d4d17164a1ed98461c2a377 Author: Sam James gentoo org> AuthorDate: Mon Oct 12 15:25:20 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 12 15:27:54 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=f28eb0e9 templates/system-login.tpl: remove duplicate block from system-auth (again) Signed-off-by: Sam James gentoo.org> templates/system-auth.tpl | 5 ----- templates/system-login.tpl | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --cc templates/system-auth.tpl index f8484f1,1bb53ae..11319d6 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@@ -9,11 -9,11 +9,6 @@@ auth [success=1 default=ignore 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 silent audit deny=3 unlock_time=600 -auth required pam_faillock.so preauth conf=/etc/security/faillock.conf --auth sufficient pam_unix.so {{ nullok|default('', true) }} try_first_pass - auth [default=die] pam_faillock.so authfail audit deny=3 unlock_time=600 -auth [default=die] pam_faillock.so authfail --{% endif %} {% if krb5 %} account [success=1 default=ignore] pam_krb5.so {{ krb5_params }} diff --cc templates/system-login.tpl index 889c2d7,bb4f093..25843f5 --- a/templates/system-login.tpl +++ b/templates/system-login.tpl @@@ -1,7 -1,12 +1,13 @@@ 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