Modify the pid and gid of bt-service to network_fw

Change-Id: I2f134debfbae79c20f47d66fb790ad06f1f3027a
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c
index b0b6043..a7944a5 100644 (file)
--- a/bt-service/bt-service-event-receiver.c
+++ b/bt-service/bt-service-event-receiver.c
@@ -3181,7 +3181,7 @@ int _bt_opp_client_event_init(void)
        GError *error = NULL;
 
        if (opc_obexd_conn == NULL) {
-               opc_obexd_conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+               opc_obexd_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
 
                if (!opc_obexd_conn) {
                        if (error) {
@@ -3243,7 +3243,7 @@ int _bt_map_client_event_init(void)
        GError *error = NULL;
 
        if (map_obexd_conn == NULL) {
-               map_obexd_conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+               map_obexd_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
 
                if (!map_obexd_conn) {
                        if (error) {
@@ -3894,7 +3894,7 @@ static int __bt_init_obexd_receiver(void)
                GError *error = NULL;
 
                if (obexd_conn == NULL) {
-                       obexd_conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+                       obexd_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
                        if (error != NULL) {
                                BT_ERR("ERROR: Can't get on session bus [%s]", error->message);
                                g_clear_error(&error);

diff --git a/bt-service/bt-service-obex-agent.c b/bt-service/bt-service-obex-agent.c
index f8f3af7..879edcc 100644 (file)
--- a/bt-service/bt-service-obex-agent.c
+++ b/bt-service/bt-service-obex-agent.c
@@ -395,7 +395,7 @@ void _bt_obex_agent_new(char *path)
        GError *error = NULL;
 
        if (conn == NULL) {
-               conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+               conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
                if (error != NULL) {
                        BT_ERR("Fail to get dbus: %s", error->message);
                        g_error_free(error);
@@ -453,7 +453,7 @@ gboolean _bt_obex_setup(const char *path)
 
        retv_if(info == NULL, FALSE);
 
-       proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SESSION,
+       proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
                                G_DBUS_PROXY_FLAGS_NONE,
                                NULL,
                                BT_OBEX_SERVICE_NAME,

diff --git a/bt-service/bt-service-obex-server.c b/bt-service/bt-service-obex-server.c
index 6baaabd..af30019 100644 (file)
--- a/bt-service/bt-service-obex-server.c
+++ b/bt-service/bt-service-obex-server.c
@@ -407,7 +407,7 @@ static GDBusProxy *__bt_get_transfer_proxy(const char *transfer_path)
        GDBusProxy *proxy;
        GError *err = NULL;
 
-       conn = _bt_gdbus_get_session_gconn();
+       conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, NULL);
 
        proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -430,7 +430,7 @@ static GDBusProxy *__bt_get_transfer_properties_proxy(const char *transfer_path)
        GDBusConnection *conn;
        GDBusProxy *proxy;
        GError *err = NULL;
-       conn = _bt_gdbus_get_session_gconn();
+       conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, NULL);
 
        proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -904,7 +904,7 @@ int _bt_register_obex_server(void)
        GError *g_error = NULL;
 
        /* Get the session bus. */
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        _bt_obex_agent_new(BT_OBEX_SERVER_AGENT_PATH);

diff --git a/bt-service/bt-service-opp-client.c b/bt-service/bt-service-opp-client.c
index 9b635e6..b6aabf9 100644 (file)
--- a/bt-service/bt-service-opp-client.c
+++ b/bt-service/bt-service-opp-client.c
@@ -268,7 +268,7 @@ gboolean _bt_obex_client_started(const char *transfer_path)
        }
 
        /* Get the session bus. */
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        retv_if(g_conn == NULL, FALSE);
        properties_proxy = g_dbus_proxy_new_sync(g_conn, G_DBUS_PROXY_FLAGS_NONE,
                                                NULL, BT_OBEXD_DBUS_NAME,
@@ -406,7 +406,7 @@ static int _bt_remove_session()
        GDBusProxy *session_proxy;
        GError *err = NULL;
 
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
        retv_if(sending_info->session_path == NULL, BLUETOOTH_ERROR_INVALID_PARAM);
 
@@ -580,7 +580,7 @@ void _bt_sending_files(void)
                return;
        if (file_offset < sending_info->file_count) {
                /* Get the session bus. */
-               g_conn = _bt_gdbus_get_session_gconn();
+               g_conn = _bt_gdbus_get_system_gconn();
                ret_if(g_conn == NULL);
 
                client_proxy = g_dbus_proxy_new_sync(g_conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -718,7 +718,7 @@ static int __bt_opp_client_start_sending(int request_id, char *address,
        BT_CHECK_PARAMETER(file_name_array, return);
 
        /* Get the session bus. */
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        client_proxy =  g_dbus_proxy_new_sync(g_conn, G_DBUS_PROXY_FLAGS_NONE,

diff --git a/bt-service/bt-service-pbap.c b/bt-service/bt-service-pbap.c
index 335f3de..fa9e27b 100644 (file)
--- a/bt-service/bt-service-pbap.c
+++ b/bt-service/bt-service-pbap.c
@@ -319,7 +319,7 @@ int _bt_pbap_connect(const bluetooth_device_address_t *address)
 
        _bt_convert_addr_type_to_string(address_string, (unsigned char *)address->addr);
        BT_DBG("Address String: %s", address_string);
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        if (g_conn == NULL) {
                        BT_ERR("Couldn't connect to session bus");
                        return EXIT_FAILURE;
@@ -1148,7 +1148,7 @@ int _bt_pbap_get_phonebook_size(const bluetooth_device_address_t *address,
                        address_string, source_string, type_string);
        BT_DBG("Session Path = %s\n", g_pbap_session_path);
 
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        if (g_conn == NULL) {
                BT_ERR("Couldn't connect to session bus");
                g_free(source_string);
@@ -1237,7 +1237,7 @@ int _bt_pbap_get_phonebook(const bluetooth_device_address_t *address,
 
        BT_DBG("Session Path = %s\n", g_pbap_session_path);
 
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        if (g_conn == NULL) {
                BT_ERR("Couldn't connect to session bus");
                g_free(source_string);
@@ -1325,7 +1325,7 @@ int _bt_pbap_get_list(const bluetooth_device_address_t *address, int source,
 
        BT_DBG("Session Path = %s\n", g_pbap_session_path);
 
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        if (g_conn == NULL) {
                BT_ERR("Couldn't connect to session bus");
                g_free(source_string);
@@ -1414,7 +1414,7 @@ int _bt_pbap_pull_vcard(const bluetooth_device_address_t *address,
 
        BT_DBG("Session Path = %s\n", g_pbap_session_path);
 
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        if (g_conn == NULL) {
                BT_ERR("Couldn't connect to session bus");
                g_free(source_string);
@@ -1501,7 +1501,7 @@ int _bt_pbap_phonebook_search(const bluetooth_device_address_t *address,
 
        BT_DBG("Session Path = %s\n", g_pbap_session_path);
 
-       g_conn = _bt_gdbus_get_session_gconn();
+       g_conn = _bt_gdbus_get_system_gconn();
        if (g_conn == NULL) {
                BT_ERR("Couldn't connect to session bus");
                g_free(source_string);

diff --git a/packaging/bluetooth-frwk-common.service b/packaging/bluetooth-frwk-common.service
index 00830a3..58a25d7 100644 (file)
--- a/packaging/bluetooth-frwk-common.service
+++ b/packaging/bluetooth-frwk-common.service
@@ -3,16 +3,14 @@ Description=Bluetooth framework
 After=multi-user.target
 
 [Service]
-User=owner
-Group=users
+User=network_fw
+Group=network_fw
 Type=dbus
 BusName=org.projectx.bt
-SmackProcessLabel=User
 ExecStart=/usr/bin/bt-service
 Restart=on-failure
 RestartSec=1
 KillMode=process
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5001/dbus/user_bus_socket
 
 [Install]
 WantedBy=starter.target

diff --git a/packaging/bluetooth-frwk-mobile-sprd.service b/packaging/bluetooth-frwk-mobile-sprd.service
index 1c65e91..b4da83a 100644 (file)
--- a/packaging/bluetooth-frwk-mobile-sprd.service
+++ b/packaging/bluetooth-frwk-mobile-sprd.service
@@ -3,15 +3,13 @@ Description=Bluetooth framework
 After=multi-user.target
 
 [Service]
-User=owner
-Group=users
+User=network_fw
+Group=network_fw
 SupplementaryGroups=priv_mediastorage priv_externalstorage
 Type=dbus
 BusName=org.projectx.bt
-SmackProcessLabel=User
 ExecStart=/usr/bin/bt-service
 KillMode=process
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5001/dbus/user_bus_socket
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/bluetooth-frwk-mobile.service b/packaging/bluetooth-frwk-mobile.service
index e2736fa..4603fb9 100644 (file)
--- a/packaging/bluetooth-frwk-mobile.service
+++ b/packaging/bluetooth-frwk-mobile.service
@@ -4,14 +4,12 @@ After=dbus.socket dbus.service
 Requires=dbus.socket
 
 [Service]
-User=owner
-Group=users
+User=network_fw
+Group=network_fw
 Type=dbus
 BusName=org.projectx.bt
-SmackProcessLabel=User
 ExecStart=/usr/bin/bt-service
 KillMode=process
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5001/dbus/user_bus_socket
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/bluetooth-frwk-tv.service b/packaging/bluetooth-frwk-tv.service
index f70a1d3..f9c3753 100644 (file)
--- a/packaging/bluetooth-frwk-tv.service
+++ b/packaging/bluetooth-frwk-tv.service
@@ -3,15 +3,13 @@ Description=Bluetooth framework
 After=bluetooth.service
 
 [Service]
-User=owner
-Group=users
+User=network_fw
+Group=network_fw
 SupplementaryGroups=priv_mediastorage priv_externalstorage
 Type=dbus
 BusName=org.projectx.bt
-SmackProcessLabel=User
 ExecStart=/usr/bin/bt-service
 KillMode=process
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5001/dbus/user_bus_socket
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target

diff --git a/packaging/bluetooth-frwk-wearable.service b/packaging/bluetooth-frwk-wearable.service
index e2736fa..4603fb9 100644 (file)
--- a/packaging/bluetooth-frwk-wearable.service
+++ b/packaging/bluetooth-frwk-wearable.service
@@ -4,14 +4,12 @@ After=dbus.socket dbus.service
 Requires=dbus.socket
 
 [Service]
-User=owner
-Group=users
+User=network_fw
+Group=network_fw
 Type=dbus
 BusName=org.projectx.bt
-SmackProcessLabel=User
 ExecStart=/usr/bin/bt-service
 KillMode=process
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5001/dbus/user_bus_socket
 
 [Install]
 WantedBy=multi-user.target