From: Mike Gilbert <floppym@gentoo.org>
Date: Fri, 4 Nov 2016 00:21:30 +0000 (-0400)
Subject: sys-apps/systemd: pam adjustment
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d8276475948e02cc91c2819e60638d50ca0e1804;p=gentoo.git

sys-apps/systemd: pam adjustment

Package-Manager: portage-2.3.2_p3
---

diff --git a/sys-apps/systemd/files/232-systemd-user-pam.patch b/sys-apps/systemd/files/232-systemd-user-pam.patch
index a6501ba41880..9c4b39109271 100644
--- a/sys-apps/systemd/files/232-systemd-user-pam.patch
+++ b/sys-apps/systemd/files/232-systemd-user-pam.patch
@@ -1,8 +1,16 @@
 --- a/src/login/systemd-user.m4
 +++ b/src/login/systemd-user.m4
-@@ -9,4 +9,5 @@
- session  required pam_selinux.so nottys open
- )m4_dnl
- session  required pam_loginuid.so
-+session required pam_limits.so
+@@ -2,11 +2,7 @@
+ #
+ # Used by systemd --user instances.
+ 
+-account required pam_unix.so
++account include system-services
+ 
+-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 include system-services
  session optional pam_systemd.so