From 9b969ff3ef0ed7b2ec5fb17ff0e850f206a22cff Mon Sep 17 00:00:00 2001 From: Soohye Shin Date: Wed, 6 May 2015 16:21:54 +0900 Subject: [PATCH] change tlm dbus path to combination of seat id and uid Change-Id: If551cb57705f70522c7cbd8cda92dbff9653cbd9 Signed-off-by: Soohye Shin --- src/Bus.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Bus.cpp b/src/Bus.cpp index 4172c7b..9c03192 100644 --- a/src/Bus.cpp +++ b/src/Bus.cpp @@ -20,8 +20,11 @@ #include "Bus.h" #include +#define ADDRESS_BUF_MAX 128 + +/* FIXME: fix seat id, it should be changed */ #define TLM_SEAT_ID "seat0" -#define TLM_DBUS_ROOT_SOCKET_PATH "/var/run/tlm/dbus-sock" +#define TLM_DBUS_SOCKET_PATH "/var/run/tlm/" struct SBus { CBus::SCallback cb; @@ -344,11 +347,10 @@ bool CBus::OnDelAll(const char *svcid, bool reload) */ static GDBusConnection *_get_bus_connection(GError **error) { -#define ADDRESS_BUF_MAX 128 gchar address[ADDRESS_BUF_MAX]; - g_snprintf(address, ADDRESS_BUF_MAX - 1, "unix:path=%s", - TLM_DBUS_ROOT_SOCKET_PATH); + g_snprintf(address, ADDRESS_BUF_MAX - 1, "unix:path=%s%s-%u", + TLM_DBUS_SOCKET_PATH, TLM_SEAT_ID, getuid()); return g_dbus_connection_new_for_address_sync(address, G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT, NULL, -- 2.7.4