up to 249

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

diff --git a/pld-pam-systemd-user.patch b/pld-pam-systemd-user.patch
index 6e1c2575089c1aa9252358e181d8e51e231d28fc..808375bfa4e720af0d182ae4fb6b64eb8de219b0 100644 (file)
--- a/pld-pam-systemd-user.patch
+++ b/pld-pam-systemd-user.patch
@@ -1,27 +1,27 @@
---- 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
+--- systemd-stable-249/src/login/systemd-user.in.orig  2021-07-07 19:41:29.000000000 +0200
++++ systemd-stable-249/src/login/systemd-user.in       2021-07-07 22:39:21.502935327 +0200
 @@ -2,19 +2,10 @@
  #
  # Used by systemd --user instances.
  
--m4_ifdef(`ENABLE_HOMED',
+-{% if ENABLE_HOMED %}
 --account sufficient pam_systemd_home.so
--)m4_dnl
--account sufficient pam_unix.so
+-{% endif %}
+-account sufficient pam_unix.so no_pass_expiry
 -account required pam_permit.so
 -
 +account               include         system-auth
- m4_ifdef(`HAVE_SELINUX',
+ {% if HAVE_SELINUX %}
 -session required pam_selinux.so close
 -session required pam_selinux.so nottys open
--)m4_dnl
+-{% endif %}
 -session required pam_loginuid.so
 -session optional pam_keyinit.so force revoke
--m4_ifdef(`ENABLE_HOMED',
+-{% if ENABLE_HOMED %}
 --session optional pam_systemd_home.so
 +session               optional        pam_selinux.so close
 +session               optional        pam_selinux.so nottys open
- )m4_dnl
+ {% endif %}
 -session optional pam_systemd.so
 +session               required        pam_loginuid.so
 +session               include system-auth