Changed root daemon -> user daemon

Change-Id: Iebe9065954d7bd83472af12d02fab8d5bf88ac9b
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a849e538cc1fcace8eeadbef779e3388ad33770..65c1d086c663f049187f065ce0a0c851bea176d8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ ADD_SUBDIRECTORY(server)
 ##########################################################
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/packaging/org.tizen.serviceadaptor.client.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.serviceadaptor.client.conf)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.serviceadaptor.client.conf DESTINATION /etc/dbus-1/system.d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.serviceadaptor.client.conf DESTINATION /etc/dbus-1/session.d)
 
 CONFIGURE_FILE(service-adaptor.pc.in service-adaptor.pc @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/service-adaptor.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)

diff --git a/api/client/src/dbus/dbus_client.c b/api/client/src/dbus/dbus_client.c
index 95d2c647f27c329371de3c3e3433d7bc7a4607c6..b76c2c67cb48964046ea1be04c2a044a89ebe8ba 100644 (file)
--- a/api/client/src/dbus/dbus_client.c
+++ b/api/client/src/dbus/dbus_client.c
@@ -209,7 +209,7 @@ static int __dbus_connection_init(dbus_service_adaptor_client_thread_data_s *thr
                return -1;
        }
 
-       connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
+       connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
 
        if (NULL == connection) {
                g_error_free(error);
@@ -237,7 +237,7 @@ static int __dbus_connection_init(dbus_service_adaptor_client_thread_data_s *thr
                }
        }
 
-       watcher_id = g_bus_watch_name(G_BUS_TYPE_SYSTEM,
+       watcher_id = g_bus_watch_name(G_BUS_TYPE_SESSION,
                        SERVICE_ADAPTOR_BUS_NAME,
                        G_BUS_NAME_WATCHER_FLAGS_NONE,
                        on_name_appeared,

diff --git a/packaging/org.tizen.serviceadaptor.client.conf.in b/packaging/org.tizen.serviceadaptor.client.conf.in
index f49013214461f268e4c4002a8b85a13338719469..6698f39644c7f31f72466a50db71d19c5b35118f 100644 (file)
--- a/packaging/org.tizen.serviceadaptor.client.conf.in
+++ b/packaging/org.tizen.serviceadaptor.client.conf.in
@@ -6,6 +6,12 @@
         <allow own="org.tizen.serviceadaptor.client"/>
        <allow send_destination="org.tizen.serviceadaptor.client"/>
     </policy>
+    <policy smack="User">
+        <allow own="org.tizen.serviceadaptor.client"/>
+        <allow send_destination="org.tizen.serviceadaptor.client"/>
+        <allow send_interface="org.tizen.serviceadaptor.client"/>
+        <allow receive_sender="org.tizen.serviceadaptor.client"/>
+    <policy>
     <policy at_console="true">
        <allow send_destination="org.tizen.serviceadaptor.client"/>
     </policy>

diff --git a/packaging/org.tizen.serviceadaptor.client.service b/packaging/org.tizen.serviceadaptor.client.service
index 4bd3a84b30b2c8ccd6996d31c1e6157c5d2e2d5a..0f101e5013fe2676534ffeeae184c4726840180f 100644 (file)
--- a/packaging/org.tizen.serviceadaptor.client.service
+++ b/packaging/org.tizen.serviceadaptor.client.service
@@ -2,4 +2,4 @@
 Name=org.tizen.serviceadaptor.client
 Exec=/bin/false
 SystemdService=service-adaptor.service
-User=root
+User=app

diff --git a/packaging/service-adaptor.service b/packaging/service-adaptor.service
index e28cd969c7d2e998493c382e60744602e03eb077..0d48c642e3555608e677b81037cdadc6c61f91d4 100644 (file)
--- a/packaging/service-adaptor.service
+++ b/packaging/service-adaptor.service
@@ -7,8 +7,6 @@ Requires=dbus.socket
 Type=dbus
 BusName=org.tizen.serviceadaptor.client
 ExecStart=/usr/bin/service-adaptor-server
-#Restart=on-failure
-#RestartSec=0
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
\ No newline at end of file

diff --git a/packaging/service-adaptor.spec b/packaging/service-adaptor.spec
index 059dce79e285fc92c16f0615ded7fd33b668a0dc..485b802c06b2da853eb41732f43208d65ecfddcb 100644 (file)
--- a/packaging/service-adaptor.spec
+++ b/packaging/service-adaptor.spec
@@ -67,12 +67,12 @@ mkdir -p %{buildroot}%{_libdir}/service-provider/message
 mkdir -p %{buildroot}%{_libdir}/service-provider/push
 mkdir -p %{buildroot}%{_libdir}/service-provider/shop
 
-mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
-install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/dbus-1/system-services/org.tizen.serviceadaptor.client.service
+mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
+install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}/service-adaptor.service
+ln -s ../service-adaptor.service %{buildroot}%{_unitdir_user}/default.target.wants/service-adaptor.service
 
-mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/service-adaptor.service
-%install_service multi-user.target.wants service-adaptor.service
+mkdir -p %{buildroot}%{_datadir}/dbus-1/services
+install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/dbus-1/services/org.tizen.serviceadaptor.client.service
 
 mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license
 cp LICENSE.APLv2 %{buildroot}/%{TZ_SYS_RO_SHARE}/license/service-adaptor
@@ -89,10 +89,10 @@ cp LICENSE.APLv2 %{buildroot}/%{TZ_SYS_RO_SHARE}/license/service-adaptor-devel
 %{_libdir}/lib*.so.*
 %{_libdir}/service-provider/*
 %{_bindir}/service-adaptor-server
-%{_unitdir}/service-adaptor.service
-%{_unitdir}/multi-user.target.wants/service-adaptor.service
-%{_datadir}/dbus-1/system-services/org.tizen.serviceadaptor.client.service
-%{_sysconfdir}/dbus-1/system.d/org.tizen.serviceadaptor.client.conf
+%{_unitdir_user}/service-adaptor.service
+%{_unitdir_user}/default.target.wants/service-adaptor.service
+%{_datadir}/dbus-1/services/org.tizen.serviceadaptor.client.service
+%{_sysconfdir}/dbus-1/session.d/org.tizen.serviceadaptor.client.conf
 %{TZ_SYS_RO_SHARE}/license/%{name}
 %{_includedir}/*.h
 

diff --git a/server/src/dbus/dbus-server.c b/server/src/dbus/dbus-server.c
index 1779b5366009acb6b68cc40fc4074369b1132629..3710327992321e98088901573571129327367e84 100644 (file)
--- a/server/src/dbus/dbus-server.c
+++ b/server/src/dbus/dbus-server.c
@@ -901,7 +901,7 @@ int dbus_server_init()
        }
 
        service_adaptor_debug("[Step] thread pool (%p)", thread_pool);
-       owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+       owner_id = g_bus_own_name(G_BUS_TYPE_SESSION,
                        SERVICE_ADAPTOR_BUS_NAME,
                        G_BUS_NAME_OWNER_FLAGS_NONE,
                        on_bus_acquired,