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 3971C138359 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 8A270E090A; Mon, 12 Oct 2020 15:28:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 6E619E08AD 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 A12D4335DC2 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 4A40B395 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.37a3f41da6fa3136c46c9d76a18ad36f4f680303.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: 37a3f41da6fa3136c46c9d76a18ad36f4f680303 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: 51bfc3d8-5ee0-4f15-a763-7872e3055eaf X-Archives-Hash: 537c9d9b70cea7d2f32e3cb23e6352fd commit: 37a3f41da6fa3136c46c9d76a18ad36f4f680303 Author: Sam James gentoo org> AuthorDate: Sun Oct 11 20:57:19 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=37a3f41d templates/system-login.tpl: move systemd, elogind blocks here Signed-off-by: Sam James gentoo.org> templates/system-auth.tpl | 8 -------- templates/system-login.tpl | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 46fc131..f8484f1 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -47,14 +47,6 @@ password optional pam_permit.so session optional pam_ssh.so {% endif %} -{% if systemd %} --session optional pam_systemd.so -{% endif %} - -{% if elogind %} --session optional pam_elogind.so -{% endif %} - {% if libcap %} -session optional pam_libcap.so {% endif %} diff --git a/templates/system-login.tpl b/templates/system-login.tpl index 99801a1..889c2d7 100644 --- a/templates/system-login.tpl +++ b/templates/system-login.tpl @@ -32,3 +32,11 @@ session optional pam_motd.so motd=/etc/motd {% if not minimal %} session optional pam_mail.so {% endif %} + +{% if systemd %} +-session optional pam_systemd.so +{% endif %} + +{% if elogind %} +-session optional pam_elogind.so +{% endif %}