From: sckim Date: Tue, 19 Mar 2013 16:07:28 +0000 (+0900) Subject: build option change X-Git-Tag: 2.1b_release~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da59381d6f56a1342058a89ea70ea24903c0f315;p=platform%2Fcore%2Fpim%2Flibaccounts-svc.git build option change Change-Id: I8f71280f61cc079b8425b6f9c1439bce8a9436ed --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c18e8dd..f7a8f50 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ SET(EXEC_PREFIX "\${prefix}") SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include ") SET(VERSION_MAJOR 0) -SET(VERSION "${VERSION_MAJOR}.2.40") +SET(VERSION "${VERSION_MAJOR}.2.41") SET(SRCS src/account.c @@ -34,6 +34,16 @@ FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) +FIND_PROGRAM(UNAME NAMES uname) +EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") +IF ("${ARCH}" STREQUAL "arm") + ADD_DEFINITIONS("-DTARGET_ARM") + MESSAGE("[TARGET] Compile") +ELSE ("${ARCH}" STREQUAL "arm") + ADD_DEFINITIONS("-DTARGET_I386") + MESSAGE("[i386] Compile") +ENDIF ("${ARCH}" STREQUAL "arm") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall") SET(CMAKE_LDFLAGS "-Wl,-zdefs") diff --git a/LICENSE b/LICENSE deleted file mode 100755 index f94008a..0000000 --- a/LICENSE +++ /dev/null @@ -1,206 +0,0 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/libaccounts-svc.manifest b/libaccounts-svc.manifest index 041f8e7..3ef97d3 100755 --- a/libaccounts-svc.manifest +++ b/libaccounts-svc.manifest @@ -13,6 +13,6 @@ - + diff --git a/packaging/libaccounts-svc.spec b/packaging/libaccounts-svc.spec index 4966754..cad65cd 100755 --- a/packaging/libaccounts-svc.spec +++ b/packaging/libaccounts-svc.spec @@ -1,7 +1,7 @@ Name: libaccounts-svc Summary: Account DB library -Version: 0.2.40 +Version: 0.2.41 Release: 1 Group: TO_BE/FILLED_IN License: Apache-2.0 diff --git a/src/account.c b/src/account.c index 5cc3065..731929c 100755 --- a/src/account.c +++ b/src/account.c @@ -41,7 +41,13 @@ #define EAS_CMDLINE "/usr/bin/eas-engine" #define EMAIL_SERVICE_CMDLINE "/usr/bin/email-service" #define ACTIVESYNC_APPID "activesync-ui" + +#ifdef TARGET_ARM #define EMAIL_APPID "email-setting-efl" +#else +#define EMAIL_APPID "vxqbrefica" +#endif + #endif static sqlite3* g_hAccountDB = NULL; @@ -799,27 +805,6 @@ static int _account_execute_insert_query(account_s *account) int error_code = ACCOUNT_ERROR_NONE; account_stmt hstmt = NULL; -#ifdef ACCOUNT_VERIFY - char* appid = NULL; - appid = _account_get_current_appid(); - - if(appid) { - //replace appid to account->package_name - _ACCOUNT_FREE(account->package_name); - account->package_name = _account_get_text(appid); - _ACCOUNT_FREE(appid); - }else { - // API caller cannot be recognized - ACCOUNT_ERROR("APP ID not detectable!\n"); - return ACCOUNT_ERROR_PERMISSION_DENIED; - } -#else - if (!account->package_name) { - ACCOUNT_ERROR("Package name is mandetory field, it can not be NULL!!!!\n"); - return ACCOUNT_ERROR_INVALID_PARAMETER; - } -#endif - /* check whether app id exist in account type db */ if (!account->user_name && !account->display_name && !account->email_address) { @@ -1522,6 +1507,27 @@ ACCOUNT_API int account_insert_to_db(account_h account, int *account_id) } else { *account_id = _account_get_next_sequence(ACCOUNT_TABLE); +#ifdef ACCOUNT_VERIFY + char* appid = NULL; + appid = _account_get_current_appid(); + + if(appid) { + //replace appid to account->package_name + _ACCOUNT_FREE(data->package_name); + data->package_name = _account_get_text(appid); + _ACCOUNT_FREE(appid); + }else { + // API caller cannot be recognized + ACCOUNT_ERROR("APP ID not detectable!\n"); + return ACCOUNT_ERROR_NOT_REGISTERED_PROVIDER; + } +#else + if (!account->package_name) { + ACCOUNT_ERROR("Package name is mandetory field, it can not be NULL!!!!\n"); + return ACCOUNT_ERROR_INVALID_PARAMETER; + } +#endif + if(account_type_query_app_id_exist(data->package_name) != ACCOUNT_ERROR_NONE) { ret_transaction = _account_end_transaction(FALSE); ACCOUNT_ERROR("App id is not registered in account type DB, transaction ret (%x)!!!!\n", ret_transaction); @@ -2563,18 +2569,23 @@ static int _account_update_account(account_s *account, int account_id) int error_code = ACCOUNT_ERROR_NONE, count=0, ret_transaction = 0; account_stmt hstmt = NULL; - _account_compare_old_record(account, account_id); - #ifdef ACCOUNT_VERIFY + char* appid = NULL; + + _ACCOUNT_FREE(account->package_name); + appid = _account_get_current_appid(); + account->package_name = _account_get_text(appid); + _ACCOUNT_FREE(appid); /* Check permission of requested appid */ if(!_account_verify_permission(account->package_name)) { ACCOUNT_ERROR("No permission to update\n"); return ACCOUNT_ERROR_PERMISSION_DENIED; } - #endif + _account_compare_old_record(account, account_id); + if (!account->package_name) { ACCOUNT_ERROR("Package name is mandetory field, it can not be NULL!!!!\n"); return ACCOUNT_ERROR_INVALID_PARAMETER;