summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-07-02 17:12:24 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-02 17:12:24 +0200
commit62bb05f64fe4d7aeadffb4815ba6a9082b1da285 (patch)
treedd1b8c1b5954cbe344966b2d723a7dfdafed34a7 /src
parent387066c2e5bda159201896b194711965b52f34a9 (diff)
bus-proxy: restore operation in non-kdbus mode
bus-proxyd is not only the bridge between legacy dbus clients and kdbus but is also used to access remote dbus servers via ssh. Let's make sure it actually works for that.
Diffstat (limited to 'src')
-rw-r--r--src/bus-proxyd/bus-proxyd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 07995ec832..3f095e0a31 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -47,7 +47,7 @@
#include "capability.h"
#include "bus-policy.h"
-static const char *arg_address = KERNEL_SYSTEM_BUS_PATH;
+static const char *arg_address = DEFAULT_SYSTEM_BUS_PATH;
static char *arg_command_line_buffer = NULL;
static bool arg_drop_privileges = false;
static char **arg_configuration = NULL;
@@ -281,6 +281,9 @@ static int process_policy(sd_bus *a, sd_bus *b, sd_bus_message *m) {
assert(b);
assert(m);
+ if (!a->is_kernel)
+ return 0;
+
if (!sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "GetAll"))
return 0;
@@ -467,6 +470,9 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
assert(b);
assert(m);
+ if (!a->is_kernel)
+ return 0;
+
if (!streq_ptr(sd_bus_message_get_destination(m), "org.freedesktop.DBus"))
return 0;