[daemon-fix] Unique session bus names for kdbus

Daemon pid is appended to session bus name (for kdbus) to allow
to run several sessions in parallel

Signed-off-by: Jacek Janczyk <j.janczyk@samsung.com>

diff --git a/autogen.sh b/autogen.sh
index 2338244..a450272 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -102,7 +102,7 @@ fi
 
 #--enable-developer --enable-verbose-mode 
 if $run_configure; then
-    $srcdir/configure --enable-developer --config-cache "$@" || exit $?
+    $srcdir/configure --enable-abstract-sockets --config-cache "$@" || exit $?
     echo 
     echo "Now type 'make' to compile $PROJECT."
 else

diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c
index 88780e3..a41bfd4 100644 (file)
--- a/bus/kdbus-d.c
+++ b/bus/kdbus-d.c
@@ -68,7 +68,7 @@ char* make_kdbus_bus(DBusBusType type, DBusError *error)
     if(type == DBUS_BUS_SYSTEM)
         snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus-%s", getuid(), "system");
     else
-        snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus", getuid());
+        snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus-%u", getuid(), getpid());
     bus_make.n_type = KDBUS_MAKE_NAME;
     bus_make.n_size = KDBUS_PART_HEADER_SIZE + strlen(bus_make.name) + 1;
     bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) + bus_make.n_size;