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 B0683138359 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 BA24CE0920; 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 A447EE0920 for ; Mon, 12 Oct 2020 15:28:03 +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 7D887335DB4 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 38311388 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: <1602513132.da499cca70c5e77c851c5f75440df188fe2eeabe.sam@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: templates/ X-VCS-Repository: proj/pambase X-VCS-Files: templates/system-login.tpl X-VCS-Directories: templates/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: da499cca70c5e77c851c5f75440df188fe2eeabe 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: 81e8f076-e5af-4355-a558-9a20d62b0a8f X-Archives-Hash: bac6d0622093bd1e52ced39d456bc389 commit: da499cca70c5e77c851c5f75440df188fe2eeabe Author: Sam James gentoo org> AuthorDate: Sun Oct 11 20:55:39 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 12 14:32:12 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=da499cca templates/system-login.tpl: remove duplicate block from system-auth Bug: https://bugs.gentoo.org/747868 Signed-off-by: Sam James gentoo.org> templates/system-login.tpl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/system-login.tpl b/templates/system-login.tpl index d51481b..99801a1 100644 --- a/templates/system-login.tpl +++ b/templates/system-login.tpl @@ -1,11 +1,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 silent audit deny=3 unlock_time=600 -auth sufficient pam_unix.so nullok try_first_pass -auth [default=die] pam_faillock.so authfail audit deny=3 unlock_time=600 -{% endif %} account required pam_access.so {{ debug|default('', true) }} account required pam_nologin.so