Commit: cd2f8cce8de56508afc0ae917d7094afec1dc6a8 - external-koush-Superuser (git)

external/koush/Superuser

Commit MetaInfo

• Revision: cd2f8cce8de56508afc0ae917d7094afec1dc6a8 (tree)
• Time: 2018-02-02 11:14:23
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

jni: correct the database path

It was moved to the device encrypted user data dir.

Change Summary

• modified: Superuser/jni/su/db.c
• modified: Superuser/jni/su/su.c
• modified: Superuser/jni/su/su.h

Incremental Difference

--- a/Superuser/jni/su/db.c
+++ b/Superuser/jni/su/db.c
@@ -84,7 +84,7 @@ policy_t database_check(struct su_context *ctx) {
     snprintf(query, sizeof(query), "select policy, until, command from uid_policy where uid=%d", ctx->from.uid);
     int ret = sqlite3_open_v2(ctx->user.database_path, &db, SQLITE_OPEN_READONLY, NULL);
     if (ret) {
-        LOGE("sqlite3 open failure: %d", ret);
+        LOGE("sqlite3 open %s failure: %d", ctx->user.database_path, ret);
         sqlite3_close(db);
         return INTERACTIVE;
     }

--- a/Superuser/jni/su/su.c
+++ b/Superuser/jni/su/su.c
@@ -239,12 +239,10 @@ static void read_options(struct su_context *ctx) {
 }
 
 static void user_init(struct su_context *ctx) {
-    if (ctx->from.uid > 99999) {
+    if (ctx->user.multiuser_mode != MULTIUSER_MODE_NONE) {
         ctx->user.android_user_id = ctx->from.uid / 100000;
-        if (ctx->user.multiuser_mode == MULTIUSER_MODE_USER) {
-            snprintf(ctx->user.database_path, PATH_MAX, "%s/%d/%s", REQUESTOR_USER_PATH, ctx->user.android_user_id, REQUESTOR_DATABASE_PATH);
-            snprintf(ctx->user.base_path, PATH_MAX, "%s/%d/%s", REQUESTOR_USER_PATH, ctx->user.android_user_id, REQUESTOR);
-        }
+        snprintf(ctx->user.database_path, PATH_MAX, "%s/%d/%s", REQUESTOR_USER_PATH, ctx->user.android_user_id, REQUESTOR_DATABASE_PATH);
+        snprintf(ctx->user.base_path, PATH_MAX, "%s/%d/%s", REQUESTOR_USER_PATH, ctx->user.android_user_id, REQUESTOR);
     }
 }
 

--- a/Superuser/jni/su/su.h
+++ b/Superuser/jni/su/su.h
@@ -61,7 +61,7 @@
 #endif
 #define REQUESTOR_DATA_PATH "/data/data/"
 #define REQUESTOR_FILES_PATH REQUESTOR_DATA_PATH REQUESTOR "/files"
-#define REQUESTOR_USER_PATH "/data/user/"
+#define REQUESTOR_USER_PATH "/data/user_de"
 #define REQUESTOR_CACHE_PATH "/dev/" REQUESTOR
 #define REQUESTOR_DAEMON_PATH REQUESTOR_CACHE_PATH ".daemon"