merge triggers

[packages/systemd.git] / pld-pam-systemd-user.patch

diff --git a/pld-pam-systemd-user.patch b/pld-pam-systemd-user.patch
index 3355c9e33f804d93bec7b34a3aaef5059898b62a..6e1c2575089c1aa9252358e181d8e51e231d28fc 100644 (file)
--- a/pld-pam-systemd-user.patch
+++ b/pld-pam-systemd-user.patch
@@ -1,19 +1,27 @@
---- systemd-232/src/login/systemd-user.m4.orig 2016-11-03 18:16:42.000000000 +0100
-+++ systemd-232/src/login/systemd-user.m4      2017-02-25 11:22:01.379262223 +0100
-@@ -2,11 +2,11 @@
+--- systemd-stable-245.6/src/login/systemd-user.m4.orig        2020-06-11 13:54:19.219560705 +0200
++++ systemd-stable-245.6/src/login/systemd-user.m4     2020-06-11 13:59:30.489083928 +0200
+@@ -2,19 +2,10 @@
  #
  # 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
+-
 +account               include         system-auth
- 
  m4_ifdef(`HAVE_SELINUX',
--session  required pam_selinux.so close
--session  required pam_selinux.so nottys open
-+session               required        pam_selinux.so close
-+session               required        pam_selinux.so nottys open
+-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
++session               optional        pam_selinux.so close
++session               optional        pam_selinux.so nottys open
  )m4_dnl
--session  required pam_loginuid.so
 -session optional pam_systemd.so
 +session               required        pam_loginuid.so
-+session               include         system-auth
++session               include system-auth