Revert "[contacts-service][Non-ACR][SATIZENVUL-1375 privilege escalation]"

This reverts commit d27e4a46e5b06770456817f875d6ffc1f2619127.

Change-Id: Ib5ab0f320b123f9d12dd6349e6c0b211551d54d6

diff --git a/common/ctsvc_vcard.c b/common/ctsvc_vcard.c
index 478a275..0a7faa8 100644 (file)
--- a/common/ctsvc_vcard.c
+++ b/common/ctsvc_vcard.c
@@ -532,10 +532,9 @@ static inline const char* __ctsvc_get_img_suffix(int type)
        case CTSVC_VCARD_IMG_AVI:
                return "avi";
        case CTSVC_VCARD_IMG_JPEG:
-               return "jpeg";
+       case CTSVC_VCARD_IMG_NONE:
        default:
-               ERR("Wrong Image type is: CTSVC_VCARD_IMG_NONE");
-               return NULL;
+               return "jpeg";
        }
 }
 

diff --git a/server/db/ctsvc_db_utils.c b/server/db/ctsvc_db_utils.c
index 087108d..ec47b21 100644 (file)
--- a/server/db/ctsvc_db_utils.c
+++ b/server/db/ctsvc_db_utils.c
@@ -549,7 +549,6 @@ int ctsvc_utils_copy_image(const char *dir, const char *src, const char *file)
        ret = _ctsvc_image_encode(src, dest, CTSVC_IMAGE_MAX_SIZE);
        if (CONTACTS_ERROR_NONE == ret)
                return ret;
-#if 0
        else
                /* LCOV_EXCL_START */
                ERR("_ctsvc_image_encode Fail(%d)", ret);
@@ -601,7 +600,7 @@ int ctsvc_utils_copy_image(const char *dir, const char *src, const char *file)
 
        close(src_fd);
        close(dest_fd);
-#endif
+
        return CONTACTS_ERROR_NONE;
 }