summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadoslaw Pajak <r.pajak@samsung.com>2013-12-16 09:56:17 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-02-11 11:55:30 +0100
commitcd627de0034fb1f73a60ae4b87025914a932421c (patch)
treeb565896c3444b4ce41388e430e80ae7ad40f17fa
parent6977db9d9037678d9c6418d5203d550badd5ab27 (diff)
[daemon-fix] Fixed bus creation - flags passed to kdbus
KDBUS_MAKE_POLICY_OPEN set as default behaviour. Change-Id: I088758df1f93411dc1154131129e2b3f25526a86 Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
-rw-r--r--bus/kdbus-d.c2
-rw-r--r--dbus/kdbus-common.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c
index ef2e5da6..745d88b0 100644
--- a/bus/kdbus-d.c
+++ b/bus/kdbus-d.c
@@ -364,7 +364,7 @@ char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error)
#ifdef POLICY_TO_KDBUS
bus_make->flags = KDBUS_MAKE_ACCESS_WORLD;
#else
- bus_make->flags = KDBUS_MAKE_POLICY_OPEN;
+ bus_make->flags = KDBUS_MAKE_ACCESS_WORLD | KDBUS_MAKE_POLICY_OPEN;
#endif
addr_value = strchr(address, ':') + 1;
diff --git a/dbus/kdbus-common.h b/dbus/kdbus-common.h
index 9958dd58..d8572d67 100644
--- a/dbus/kdbus-common.h
+++ b/dbus/kdbus-common.h
@@ -39,7 +39,7 @@
#define KDBUS_PART_SIZE(s) KDBUS_ALIGN8((s) + KDBUS_PART_HEADER_SIZE)
//todo restore if DBus policy will be applied in kdbus somehow
-#define POLICY_TO_KDBUS
+//#define POLICY_TO_KDBUS
dbus_bool_t register_kdbus_policy(const char* name, DBusTransport *transport, unsigned long int uid);
int request_kdbus_name(int fd, const char *name, const __u64 flags, __u64 id);