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 EC834138359 for ; Tue, 3 Nov 2020 07:22:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46EC4E0AAF; Tue, 3 Nov 2020 07:22:07 +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 2FA12E0AAF for ; Tue, 3 Nov 2020 07:22:07 +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 F0058340D96 for ; Tue, 3 Nov 2020 07:22:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A89E73B2 for ; Tue, 3 Nov 2020 07:22:04 +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: <1604387956.3f36e2c3de28b3cde25a27d05e49d354e098c368.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: 3f36e2c3de28b3cde25a27d05e49d354e098c368 X-VCS-Branch: master Date: Tue, 3 Nov 2020 07:22:04 +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: 8ac4b5a6-0456-4d0a-8140-5158c28a0e33 X-Archives-Hash: 07dfabdc614cfc45d45fc576de8f87e4 commit: 3f36e2c3de28b3cde25a27d05e49d354e098c368 Author: Sam James gentoo org> AuthorDate: Tue Nov 3 07:19:16 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 3 07:19:16 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=3f36e2c3 templates/system-auth.tpl: shift cap to be with other auth Signed-off-by: Sam James gentoo.org> templates/system-auth.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 4ff78e4..19e08fa 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -12,6 +12,10 @@ auth [success=1 default=ignore] pam_unix.so {{ nullok|default('', true) }} {{ d auth [default=die] pam_faillock.so authfail auth optional pam_permit.so +{% if caps %} +-auth optional pam_cap.so +{% endif %} + {% if krb5 %} account [success=2 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} @@ -47,8 +51,4 @@ password optional pam_permit.so session optional pam_ssh.so {% endif %} -{% if caps %} --auth optional pam_cap.so -{% endif %} - {% include "templates/system-session.tpl" %}