Fix for apps that use multiple commands

ChainsDD · ChainsDD · commit de0050de03d2 · 2012-11-18T17:39:44.000Z
diff --git a/activity.c b/activity.c
@@ -88,10 +88,11 @@ int send_intent(struct su_context *ctx, allow_t allow, const char *action)
         char command[ARG_MAX];
 
         snprintf(command, sizeof(command),
-            "exec /system/bin/am broadcast -a %s --es socket '%s' "
-            "--ei caller_uid %d --ei allow %d "
-            "--ei version_code %d",
-            action, socket_path, uid, allow, VERSION_CODE);
+            "exec /system/bin/am broadcast --user %d -a %s --es socket '%s' "
+            "--ei caller_uid %d --ei allow %d --es desired_cmd '%s' "
+            "--ei all %d --ei version_code %d",
+            ctx->from.user, action, socket_path, uid, allow, get_command(&ctx->to),
+            ctx->to.all, VERSION_CODE);
         char *args[] = { "sh", "-c", command, NULL, };
 
         /*
diff --git a/db.c b/db.c
@@ -20,7 +20,7 @@
 
 #include "su.h"
 
-int database_check(const struct su_context *ctx)
+int database_check(struct su_context *ctx)
 {
     FILE *fp;
     char filename[PATH_MAX];
@@ -47,6 +47,10 @@ int database_check(const struct su_context *ctx)
             LOGD("Comparing '%s' to '%s'", cmd, get_command(&ctx->to));
             if (strcmp(cmd, get_command(&ctx->to)) == 0)
                 break;
+            else if (strcmp(cmd, "any") == 0) {
+                ctx->to.all = 1;
+                break;
+            }
             else
                 strcpy(allow, "prompt");
         }
diff --git a/su.h b/su.h
@@ -64,6 +64,8 @@ struct su_request {
     char **argv;
     int argc;
     int optind;
+    int appId;
+    int all;
 };
 
 struct su_context {
@@ -80,7 +82,7 @@ typedef enum {
     ALLOW = 1,
 } allow_t;
 
-extern allow_t database_check(const struct su_context *ctx);
+extern allow_t database_check(struct su_context *ctx);
 extern void set_identity(unsigned int uid);
 extern int send_intent(struct su_context *ctx,
                        allow_t allow, const char *action);
