summaryrefslogtreecommitdiff
path: root/units/user
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-01-17 13:57:46 +0100
committerDavid Herrmann <dh.herrmann@gmail.com>2015-01-17 14:00:19 +0100
commita8a1a43f482af480c375a97921df6b42452c7092 (patch)
tree3e249502d67bf7fff1a646a9f12e14d5e62afc61 /units/user
parentf4a53250acb3aea2eb5ebed059887b9417afbd9e (diff)
downloadsystemd-a8a1a43f482af480c375a97921df6b42452c7092.tar.gz
bus-proxy: turn into multi-threaded daemon
Instead of using Accept=true and running one proxy for each connection, we now run one proxy-daemon with a thread per connection. This will enable us to share resources like policies in the future.
Diffstat (limited to 'units/user')
-rw-r--r--units/user/.gitignore2
-rw-r--r--units/user/systemd-bus-proxyd.service.in (renamed from units/user/systemd-bus-proxyd@.service.in)5
-rw-r--r--units/user/systemd-bus-proxyd.socket1
3 files changed, 2 insertions, 6 deletions
diff --git a/units/user/.gitignore b/units/user/.gitignore
index c91ed626c8..6111b10ccf 100644
--- a/units/user/.gitignore
+++ b/units/user/.gitignore
@@ -1,3 +1,3 @@
/systemd-exit.service
-/systemd-bus-proxyd@.service
+/systemd-bus-proxyd.service
/systemd-consoled.service
diff --git a/units/user/systemd-bus-proxyd@.service.in b/units/user/systemd-bus-proxyd.service.in
index 0ab5462ed5..e1e399dc32 100644
--- a/units/user/systemd-bus-proxyd@.service.in
+++ b/units/user/systemd-bus-proxyd.service.in
@@ -9,8 +9,5 @@
Description=Legacy D-Bus Protocol Compatibility Daemon
[Service]
-# The first argument will be replaced by the service by information on
-# the process requesting the proxy, we need a placeholder to keep the
-# space available for this.
-ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/%U-user/bus xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/%U-user/bus
NotifyAccess=main
diff --git a/units/user/systemd-bus-proxyd.socket b/units/user/systemd-bus-proxyd.socket
index 412052a88f..b9efc0e7ce 100644
--- a/units/user/systemd-bus-proxyd.socket
+++ b/units/user/systemd-bus-proxyd.socket
@@ -10,4 +10,3 @@ Description=Legacy D-Bus Protocol Compatibility Socket
[Socket]
ListenStream=%t/bus
-Accept=yes