From: Ickhee Woo Date: Mon, 28 Nov 2016 12:56:03 +0000 (+0900) Subject: sync code with tizen_3.0 branch X-Git-Tag: submit/tizen/20161129.100222^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3e595b26b2dbc5e74d50124ef2e58ad68d6ea7f;p=platform%2Fcore%2Fapi%2Flibaccount-service.git sync code with tizen_3.0 branch Change-Id: Ibcacfa783e8f7bec3cc642d94f27bdde10692658 Signed-off-by: Ickhee Woo --- diff --git a/packaging/libaccount-service.spec b/packaging/libaccount-service.spec index ddaa521..85a106c 100644 --- a/packaging/libaccount-service.spec +++ b/packaging/libaccount-service.spec @@ -1,7 +1,7 @@ Name: libaccount-service Summary: Account DB library -Version: 0.4.8 +Version: 0.4.10 Release: 1 Group: Social & Content/API License: Apache-2.0 diff --git a/src/account_offline.c b/src/account_offline.c index f443a42..5e9f891 100644 --- a/src/account_offline.c +++ b/src/account_offline.c @@ -98,15 +98,15 @@ static int _account_user_db_open(sqlite3 **p_hAccountDB, int mode, uid_t uid) ACCOUNT_GET_USER_DB_DIR(account_db_dir, sizeof(account_db_dir), uid); if ((-1 == access(account_db_dir, F_OK)) && uid != OWNER_ROOT) { int ret; - mkdir(account_db_dir, 777); + mkdir(account_db_dir, 755); ret = chown(account_db_dir, SERVICE_FW_UID, SERVICE_FW_GID); ACCOUNT_DEBUG("chown result = [%d]", ret); - ret = chmod(account_db_dir, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH); + ret = chmod(account_db_dir, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH); ACCOUNT_DEBUG("chmod result = [%d]", ret); rc = db_util_open(account_db_path, p_hAccountDB, DB_UTIL_REGISTER_HOOK_METHOD); ret = chown(account_db_path, SERVICE_FW_UID, SERVICE_FW_GID); ACCOUNT_DEBUG("chown result = [%d]", ret); - ret = chmod(account_db_path, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP); + ret = chmod(account_db_path, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); ACCOUNT_DEBUG("chmod result = [%d]", ret); } else { if (mode == ACCOUNT_DB_OPEN_READWRITE) @@ -172,7 +172,7 @@ static int _account_global_db_open(int mode) return ACCOUNT_ERROR_PERMISSION_DENIED; } - ACCOUNT_GET_GLOBAL_DB_PATH(account_db_path, sizeof(account_db_path)); + ACCOUNT_GET_OWNER_DB_PATH(account_db_path, sizeof(account_db_path), 5001); _INFO("account_db_path canonicalized = %s", account_db_path); @@ -180,15 +180,15 @@ static int _account_global_db_open(int mode) ACCOUNT_GET_USER_DB_DIR(account_db_dir, sizeof(account_db_dir), uid); if ((-1 == access(account_db_dir, F_OK)) && uid != OWNER_ROOT) { int ret; - mkdir(account_db_dir, 777); + mkdir(account_db_dir, 755); ret = chown(account_db_dir, SERVICE_FW_UID, SERVICE_FW_GID); ACCOUNT_DEBUG("chown result = [%d]", ret); - ret = chmod(account_db_dir, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH); + ret = chmod(account_db_dir, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH); ACCOUNT_DEBUG("chmod result = [%d]", ret); rc = db_util_open(account_db_path, &g_hAccountGlobalDB, DB_UTIL_REGISTER_HOOK_METHOD); ret = chown(account_db_path, SERVICE_FW_UID, SERVICE_FW_GID); ACCOUNT_DEBUG("chown result = [%d]", ret); - ret = chmod(account_db_path, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP); + ret = chmod(account_db_path, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); ACCOUNT_DEBUG("chmod result = [%d]", ret); } else { if (mode == ACCOUNT_DB_OPEN_READWRITE) @@ -292,6 +292,7 @@ ACCOUNT_INTERNAL_API int account_type_insert_to_db_offline(account_type_h accoun } /* Workaround for internal UTC */ + _INFO("UID is [%d]", (int)uid); if (uid == 0) uid = getuid();