pam: systemd-user - call selinux module

https://bugzilla.redhat.com/show_bug.cgi?id=1262933

diff --git a/Makefile.am b/Makefile.am
index 3cc27cbbfce7c85e1efdb79a55fbb8d32f663e33..41bfdfbeac487cba37f0f6ff1ca718f3ef4c0636 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5488,6 +5488,8 @@ pamlib_LTLIBRARIES = \
 dist_pamconf_DATA = \
        src/login/systemd-user
 
+EXTRA_DIST += \
+       src/login/systemd-user.m4
 endif
 
 nodist_systemunit_DATA += \

diff --git a/src/login/.gitignore b/src/login/.gitignore
index 5c0b2ac68c568e88c5c5489ee4f4bb5f8a5dc749..39088ec25217c5795c6cedc62e492b5d6ae66682 100644 (file)
--- a/src/login/.gitignore
+++ b/src/login/.gitignore
@@ -2,3 +2,4 @@
 /org.freedesktop.login1.policy
 /71-seat.rules
 /73-seat-late.rules
+/systemd-user

diff --git a/src/login/systemd-user b/src/login/systemd-user
deleted file mode 100644 (file)
index 8112d74..0000000
--- a/src/login/systemd-user
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is part of systemd.
-#
-# Used by systemd --user instances.
-
-account  include system-auth
-session  include system-auth

diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
new file mode 100644 (file)
index 0000000..7933508
--- /dev/null
+++ b/src/login/systemd-user.m4
@@ -0,0 +1,11 @@
+# This file is part of systemd.
+#
+# Used by systemd --user instances.
+
+account  include system-auth
+
+m4_ifdef(`HAVE_SELINUX',
+session  required pam_selinux.so close
+session  required pam_selinux.so nottys open
+)m4_dnl
+session  include system-auth