diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-22 18:19:36 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-22 18:19:36 +0200 |
| commit | 68321c9a97e6777041e4bf547cfe85a5d9c5fbb0 (patch) | |
| tree | ed8d578441d4b5d99fee79f2e72735437c50675f | |
| parent | a6affd88bab11dceac59835a0d2611910bc4a832 (diff) | |
| parent | a13cff19ce8a52e4f5c436e3cc84355691ed6341 (diff) | |
Merge pull request #1338 from kaysievers/pam
pam: systemd-user - call selinux module
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/login/.gitignore | 1 | ||||
| -rw-r--r-- | src/login/systemd-user.m4 (renamed from src/login/systemd-user) | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 3cc27cbbfc..41bfdfbeac 100644 --- 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 5c0b2ac68c..39088ec252 100644 --- 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.m4 index 8112d74640..7933508f2b 100644 --- a/src/login/systemd-user +++ b/src/login/systemd-user.m4 @@ -3,4 +3,9 @@ # 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 |