Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb53617' into 'master'
[systemd] Return back pam_limits.so to systemd-user. Contributes to JB#53617

See merge request mer-core/systemd!46
  • Loading branch information
Matti Kosola committed Mar 22, 2021
2 parents 1604d9d + f8b755a commit 4ac37c9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
12 changes: 12 additions & 0 deletions rpm/systemd-pam_limits-fix.patch
@@ -0,0 +1,12 @@
Return back missing pam_limits.so because the new systemd version (v238)
doesn't include "system-auth" module.

diff -purN systemd/src/login/systemd-user.m4 systemd-izh/src/login/systemd-user.m4
--- systemd/src/login/systemd-user.m4 2021-03-22 11:23:59.831352968 +0000
+++ systemd-izh/src/login/systemd-user.m4 2021-03-22 11:26:20.741907967 +0000
@@ -5,4 +5,5 @@
account required pam_unix.so
session required pam_loginuid.so
session optional pam_keyinit.so force revoke
+session required pam_limits.so
session optional pam_systemd.so
1 change: 1 addition & 0 deletions rpm/systemd.spec
Expand Up @@ -59,6 +59,7 @@ Patch58: systemd-240-core-remove-support-for-API-bus-started-outside-our-
Patch59: systemd-240-units-add-new-system-update-pre.target.patch
Patch60: systemd-Fix-udev-firmware-events-dependencies.patch
Patch61: systemd-245-polkit-async-CVE-2020-1712.diff
Patch62: systemd-pam_limits-fix.patch
# This patch serves two purposes: it adds needed "#include <sys/sysmacros.h>"
# and initializes variables with automatic cleanup functions to silence
# compiler warnings.
Expand Down

0 comments on commit 4ac37c9

Please sign in to comment.