Revert "Depend on SmackProcessLabel= to set correct label instead of pam"

This reverts commit a48ee08ebb7de0d90d2c29a7d792b19654ee470a.

Change-Id: Iada206046ff4c0454223ae00aa9bfdc5bcfc5a32

diff --git a/data/tlm-default-login b/data/tlm-default-login
index 53d6173f908aa1d6e88bc6911a0ae7a0a8223df1..81380154d89232ac7e317ad4c7b1736b2a3339a5 100644 (file)
--- a/data/tlm-default-login
+++ b/data/tlm-default-login
@@ -10,3 +10,4 @@ session         required        pam_systemd.so
 session         required        pam_loginuid.so
 session         required        pam_namespace.so
 session         optional        pam_keyinit.so force revoke
+session         required        pam_smack.so

diff --git a/data/tlm-login b/data/tlm-login
index c9219244a2da925833cae8d28e1f1775ac36291d..0bc80455ee3086c11debde8b772a51a18a54b15b 100644 (file)
--- a/data/tlm-login
+++ b/data/tlm-login
@@ -11,3 +11,4 @@ session         required        pam_systemd.so
 session         required        pam_loginuid.so
 session         required        pam_namespace.so
 session         optional        pam_keyinit.so force revoke
+session         required        pam_smack.so
\ No newline at end of file

diff --git a/data/tlm-system-login b/data/tlm-system-login
index 8e247bc0155ae76a4870f1e580085a09c1db3afd..2f7b518d8f6f1dda866707624548be5b7aa4c16e 100644 (file)
--- a/data/tlm-system-login
+++ b/data/tlm-system-login
@@ -8,3 +8,4 @@ session         include         system-auth
 session         required        pam_loginuid.so
 session         required        pam_namespace.so
 session         optional        pam_keyinit.so force revoke
+session         required        pam_smack.so

diff --git a/data/tlm.service b/data/tlm.service
index 9001d33ea0aea6acf2e975eec0d0fcd433f346ab..94c5fe08e331261f6f130355037b002c72c5d9da 100644 (file)
--- a/data/tlm.service
+++ b/data/tlm.service
@@ -4,7 +4,7 @@ After=systemd-user-sessions.service systemd-logind.service
 Requires=dbus.socket
 
 [Service]
-SmackProcessLabel=User
+SmackProcessLabel=System
 ExecStart=/usr/bin/tlm
 CapabilityBoundingSet=~CAP_MAC_ADMIN
 CapabilityBoundingSet=~CAP_MAC_OVERRIDE