X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fuser%40.service.m4.in;h=340c02b59b469ee4498e2f6f000dc457ae042659;hp=7b7d52b60bacbd97a5b40068ca7f809b4b167219;hb=cb01aedc3b4ba70859267159fe716253e3551ec6;hpb=4acbce79798347cddf1e1d42e9be571e0a041873

diff --git a/units/user@.service.m4.in b/units/user@.service.m4.in
index 7b7d52b60..340c02b59 100644
--- a/units/user@.service.m4.in
+++ b/units/user@.service.m4.in
@@ -6,17 +6,18 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=User Manager for %I
+Description=User Manager for UID %i
 After=systemd-user-sessions.service
 
 [Service]
-User=%I
+User=%i
 PAMName=systemd-user
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
-m4_ifdef(`ENABLE_KDBUS',
-Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/dev/kdbus/%I-user/bus;unix:path=/run/user/%I/bus
-,m4_dnl
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/bus
-)m4_dnl
 Slice=user-%i.slice
+KillMode=mixed
+Delegate=yes
+m4_ifdef(`HAVE_SMACK',
+Capabilities=cap_mac_admin=i
+SecureBits=keep-caps
+)