From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 May 2020 20:25:34 +0000 (+0200)
Subject: login: include pam_systemd_home.so in the default PAM snippet we ship for user@.service
X-Git-Tag: v246-rc1~428^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd685faa1a3d08598322dc6e256ac585cffcdbac;p=thirdparty%2Fsystemd.git

login: include pam_systemd_home.so in the default PAM snippet we ship for user@.service

Let's make sure systemd-homed works out-of-the box as well as possible.
---

diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
index 4f85b4b7fe8..f6313f79fe1 100644
--- a/src/login/systemd-user.m4
+++ b/src/login/systemd-user.m4
@@ -2,11 +2,19 @@
 #
 # Used by systemd --user instances.
 
-account required pam_unix.so
+m4_ifdef(`ENABLE_HOMED',
+-account sufficient pam_systemd_home.so
+)m4_dnl
+account sufficient pam_unix.so
+account required pam_permit.so
+
 m4_ifdef(`HAVE_SELINUX',
 session required pam_selinux.so close
 session required pam_selinux.so nottys open
 )m4_dnl
 session required pam_loginuid.so
 session optional pam_keyinit.so force revoke
+m4_ifdef(`ENABLE_HOMED',
+-session optional pam_systemd_home.so
+)m4_dnl
 session optional pam_systemd.so