[daemon-fix] fixed working when compiled with kdbus but sockets used as a transport

Change-Id: I3a201142689672228ab845e6b4f310132e43c201
Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>

diff --git a/bus/services.c b/bus/services.c
index 20ebb5f..d3b7554 100644 (file)
--- a/bus/services.c
+++ b/bus/services.c
@@ -1505,9 +1505,16 @@ bus_service_get_primary_owners_connection (BusService *service)
   owner = bus_service_get_primary_owner (service);
 
 #ifdef ENABLE_KDBUS_TRANSPORT
-  if(kdbus_get_name_owner(owner->conn, bus_service_get_name(service), unique_name) < 0)
+  if(!owner)
     return NULL;
-  return _bus_service_find_owner_connection(service, unique_name);  //bus_connections_find_conn_by_name would be safer? but slower
+  if(bus_context_is_kdbus(service->registry->context))
+  {
+    if(kdbus_get_name_owner(owner->conn, bus_service_get_name(service), unique_name) < 0)
+      return NULL;
+    return _bus_service_find_owner_connection(service, unique_name);  //bus_connections_find_conn_by_name would be safer? but slower
+  }
+  else
+    return owner->conn;
 #else
   if (owner != NULL)
     return owner->conn;