Revert "Fix UID/GID"

This reverts commit d98f494182ff1083ec9cd73f4c3f77afe62a9c64.

Change-Id: Ia1227b5002d2ca01653db8b162403f366dfbf0fd

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index e8526dc..3ccb635 100755 (executable)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -205,7 +205,8 @@ static int __media_db_request_update_tcp(ms_msg_type_e msg_type, const char *req
        /*Set server Address*/
        memset(&serv_addr, 0, sizeof(serv_addr));
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[sock_info.port], strlen(MEDIA_IPC_PATH[sock_info.port]));
+//     MSAPI_DBG_SLOG("%s", MEDIA_IPC_PATH[port]);
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port])));
 
        /* Connecting to the media db server */
        if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {
@@ -286,7 +287,8 @@ static int __media_db_prepare_tcp_client_socket()
        /*Set server Address*/
        memset(&serv_addr, 0, sizeof(serv_addr));
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[sock_info.port], strlen(MEDIA_IPC_PATH[sock_info.port]));
+//     MSAPI_DBG_SLOG("%s", MEDIA_IPC_PATH[port]);
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port])));
 
        /* Connecting to the media db server */
        if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
index 6443651..5496fe9 100644 (file)
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -55,7 +55,7 @@ int _media_dcm_request(int msg_type, const char *path, uid_t uid)
        memset(&serv_addr, 0, sizeof(serv_addr));
        sock = sock_info.sock_fd;
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[sock_info.port], strlen(MEDIA_IPC_PATH[sock_info.port]));
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port])));
 
        /* Connecting to the thumbnail server */
        if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index b5f8aae..7015c57 100644 (file)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -37,16 +37,16 @@
 #define MS_SOCK_UDP_BLOCK_SIZE 512
 
 char MEDIA_IPC_PATH[][70] = {
-       {"/tmp/media-server/media_ipc_dbbatchupdate.socket"},
-       {"/tmp/media-server/media_ipc_scandaemon.socket"},
-       {"/tmp/media-server/media_ipc_scanner.socket"},
-       {"/tmp/media-server/media_ipc_dbupdate.socket"},
-       {"/tmp/media-server/media_ipc_thumbcreator.socket"},
-       {"/tmp/media-server/media_ipc_thumbcomm.socket"},
-       {"/tmp/media-server/media_ipc_thumbdaemon.socket"},
-       {"/tmp/media-server/media_ipc_dcmcreator.socket"},
-       {"/tmp/media-server/media_ipc_dcmcomm.socket"},
-       {"/tmp/media-server/media_ipc_dcmdaemon.socket"},
+       {"media-server/media_ipc_dbbatchupdate.socket"},
+       {"media-server/media_ipc_scandaemon.socket"},
+       {"media-server/media_ipc_scanner.socket"},
+       {"media-server/media_ipc_dbupdate.socket"},
+       {"media-server/media_ipc_thumbcreator.socket"},
+       {"media-server/media_ipc_thumbcomm.socket"},
+       {"media-server/media_ipc_thumbdaemon.socket"},
+       {"media-server/media_ipc_dcmcreator.socket"},
+       {"media-server/media_ipc_dcmcomm.socket"},
+       {"media-server/media_ipc_dcmdaemon.socket"},
 };
 
 char MEDIA_IPC_PATH_CLIENT[][80] = {
@@ -208,8 +208,9 @@ int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port,
        memset(&serv_addr, 0, sizeof(serv_addr));
 
        serv_addr.sun_family = AF_UNIX;
-       unlink(MEDIA_IPC_PATH[serv_port]);
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[serv_port], strlen(MEDIA_IPC_PATH[serv_port]));
+//     MSAPI_DBG_SLOG("%s", tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]));
+       unlink(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]));
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port])));
 
        /* Bind to the local address */
        for (i = 0; i < 100; i++) {
@@ -241,7 +242,7 @@ int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port,
        }
 
        /*change permission of sock file*/
-       if (chmod(MEDIA_IPC_PATH[serv_port], 0777) < 0)
+       if (chmod(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), 0777) < 0)
                MSAPI_DBG_STRERROR("chmod failed");
 
        *sock_fd = sock;
@@ -257,7 +258,7 @@ int ms_ipc_send_msg_to_server(int sockfd, ms_msg_port_type_e port, ms_comm_msg_s
        /* Set server Address */
        memset(&addr, 0, sizeof(addr));
        addr.sun_family = AF_UNIX;
-       strncpy(addr.sun_path, MEDIA_IPC_PATH[port], strlen(MEDIA_IPC_PATH[port]));
+       strncpy(addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port])));
 //     MSAPI_DBG_SLOG("%s", addr.sun_path);
 
        if (sendto(sockfd, send_msg, sizeof(*(send_msg)), 0, (struct sockaddr *)&addr, sizeof(addr)) != sizeof(*(send_msg))) {
@@ -282,7 +283,7 @@ int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_msg_port_type_e port, ms_comm_m
        memset(&addr, 0, sizeof(addr));
 
        addr.sun_family = AF_UNIX;
-       strncpy(addr.sun_path, MEDIA_IPC_PATH[port], strlen(MEDIA_IPC_PATH[port]));
+       strncpy(addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port])));
 //     MSAPI_DBG("%s", addr.sun_path);
 
        /* Connecting to the media db server */

diff --git a/packaging/media-server-user.path b/packaging/media-server-user.path
index bc07861..f5ef09c 100644 (file)
--- a/packaging/media-server-user.path
+++ b/packaging/media-server-user.path
@@ -2,4 +2,4 @@
 Description=media-server-user path activation
 
 [Path]
-PathExists=/tmp/media-server/media_ipc_dbbatchupdate.socket
+PathExists=/run/media-server/media_ipc_dbbatchupdate.socket

diff --git a/packaging/media-server.service b/packaging/media-server.service
index 6e4863a..a63af37 100644 (file)
--- a/packaging/media-server.service
+++ b/packaging/media-server.service
@@ -2,8 +2,6 @@
 Description=Media server
 
 [Service]
-User=multimedia_fw
-Group=multimedia_fw
 Type=simple
 ExecStart=/usr/bin/media-server
 Restart=always

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 5238d0d..5e13f3d 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.80
+Version:    0.2.79
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
index 599352b..2af85cf 100644 (file)
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -300,7 +300,7 @@ gboolean _ms_dcm_agent_send_msg_to_dcm_server(dcmMsg *recv_msg, dcmMsg *res_msg)
        memset(&serv_addr, 0, sizeof(serv_addr));
        sock = sock_info.sock_fd;
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[MS_DCM_DAEMON_PORT], strlen(MEDIA_IPC_PATH[MS_DCM_DAEMON_PORT]));
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_DCM_DAEMON_PORT]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_DCM_DAEMON_PORT])));
 
        /* Connecting to the DCM service */
        if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index ca70218..ae7025e 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -313,7 +313,7 @@ static void __ms_add_requst_receiver(GMainLoop *mainloop, GIOChannel **channel)
 
        /*prepare socket*/
        /* create dir socket */
-       _mkdir("/tmp/media-server", S_IRWXU | S_IRWXG | S_IRWXO);
+       _mkdir(tzplatform_mkpath(TZ_SYS_RUN, "media-server"), S_IRWXU | S_IRWXG | S_IRWXO);
 
        /* Create and bind new UDP socket */
        if (ms_ipc_create_server_socket(MS_PROTOCOL_TCP, MS_SCANNER_PORT, &sockfd) != MS_MEDIA_ERR_NONE) {

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index add6599..ef01dd6 100644 (file)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -470,7 +470,7 @@ gboolean _ms_thumb_agent_send_msg_to_thumb_server(thumbMsg *recv_msg, thumbMsg *
        memset(&serv_addr, 0, sizeof(serv_addr));
        sock = sock_info.sock_fd;
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[MS_THUMB_DAEMON_PORT], strlen(MEDIA_IPC_PATH[MS_THUMB_DAEMON_PORT]));
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_THUMB_DAEMON_PORT]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_THUMB_DAEMON_PORT])));
 
        /* Connecting to the thumbnail server */
        if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {