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 308E91382C5 for ; Sun, 31 Jan 2021 21:36:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6B88E0893; Sun, 31 Jan 2021 21:36:13 +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 BE3E3E0893 for ; Sun, 31 Jan 2021 21:36:13 +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 A09F93410C3 for ; Sun, 31 Jan 2021 21:36:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 410F6476 for ; Sun, 31 Jan 2021 21:36:11 +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: <1611892002.639b45ccb986de7314372a4a841e6f04c536c49a.sam@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: templates/, / X-VCS-Repository: proj/pambase X-VCS-Files: pambase.py templates/system-auth.tpl templates/system-session.tpl X-VCS-Directories: templates/ / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 639b45ccb986de7314372a4a841e6f04c536c49a X-VCS-Branch: master Date: Sun, 31 Jan 2021 21:36:11 +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: a841c77c-d79c-4dbf-9216-e609c9b6fba9 X-Archives-Hash: 6d25c50a57c86c746bec8b57bbb1856e commit: 639b45ccb986de7314372a4a841e6f04c536c49a Author: Sam James gentoo org> AuthorDate: Fri Jan 29 03:46:42 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 29 03:46:42 2021 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=639b45cc Add systemd-homed support Bug: https://bugs.gentoo.org/767784 Signed-off-by: Sam James gentoo.org> pambase.py | 1 + templates/system-auth.tpl | 6 ++++++ templates/system-session.tpl | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/pambase.py b/pambase.py index 278d578..eb3d4fe 100755 --- a/pambase.py +++ b/pambase.py @@ -9,6 +9,7 @@ def main(): parser = argparse.ArgumentParser(description='basic Gentoo PAM configuration files') parser.add_argument('--gnome-keyring', action="store_true", help='enable pam_gnome_keyring.so module') parser.add_argument('--caps', action="store_true", help='enable pam_cap.so module') + parser.add_argument('--homed', action="store_true", help='enable pam_systemd_homed.so module') parser.add_argument('--passwdqc', action="store_true", help='enable pam_passwdqc.so module') parser.add_argument('--pwhistory', action="store_true", help='enable pam_pwhistory.so module') parser.add_argument('--pwquality', action="store_true", help='enable pam_pwquality.so module') diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 01a29db..53557dc 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -2,6 +2,9 @@ auth required pam_env.so {{ debug|default('', true) }} {% if pam_ssh %} auth sufficient pam_ssh.so {% endif %} +{% if homed %} +-auth sufficient pam_systemd_home.so +{% endif %} {% if krb5 %} auth [success=3 default=ignore] pam_krb5.so {{ krb5_params }} @@ -15,6 +18,9 @@ auth [default=die] pam_faillock.so authfail -auth optional pam_cap.so {% endif %} +{% if homed %} +-account sufficient pam_systemd_home.so +{% endif %} {% if krb5 %} account [success=2 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} diff --git a/templates/system-session.tpl b/templates/system-session.tpl index 2a7024b..3dd1d70 100644 --- a/templates/system-session.tpl +++ b/templates/system-session.tpl @@ -4,6 +4,10 @@ session required pam_env.so {{ debug|default('', true) }} session optional pam_mktemp.so {% endif %} +{% if homed %} +-session optional pam_systemd_home.so +{% endif %} + {%if krb5 %} session [success=1 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %}