From: repo Shareef Ali <shareefalis@gmail.com>
Date: Mon, 29 Dec 2014 23:30:15 +0000 (-0600)
Subject: Superuser: Don't set root access as a default fallback option.
X-Git-Tag: android-x86-6.0-r1~3
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-koush-Superuser.git;a=commitdiff_plain;h=fe33e4a1d7385d5cca49e05a1938c6e2cd7b69cb

Superuser: Don't set root access as a default fallback option.

Problem: if persist.sys.root_access is not present, it will set
root access anyways regardless of build type
fix: set to 0 anyway which is no root.

Change-Id: I3665d965a6fbb21fd26a8d7256579eb272b608f0
---

diff --git a/Superuser/jni/su/su.c b/Superuser/jni/su/su.c
index 08d84b9..f27d656 100644
--- a/Superuser/jni/su/su.c
+++ b/Superuser/jni/su/su.c
@@ -569,12 +569,12 @@ int access_disabled(const struct su_initiator *from) {
         if (data != NULL) {
             len = strlen(data);
             if (len >= PROPERTY_VALUE_MAX)
-                memcpy(enabled, "1", 2);
+                memcpy(enabled, "0", 2);
             else
                 memcpy(enabled, data, len + 1);
             free(data);
         } else
-            memcpy(enabled, "1", 2);
+            memcpy(enabled, "0", 2);
 
         /* enforce persist.sys.root_access on non-eng builds for apps */
         if (strcmp("eng", build_type) != 0 &&
diff --git a/Superuser/src/com/koushikdutta/superuser/util/Settings.java b/Superuser/src/com/koushikdutta/superuser/util/Settings.java
index 41e870a..4255f8c 100755
--- a/Superuser/src/com/koushikdutta/superuser/util/Settings.java
+++ b/Superuser/src/com/koushikdutta/superuser/util/Settings.java
@@ -329,11 +329,11 @@ public class Settings {
             case SUPERUSER_ACCESS_APPS_AND_ADB:
                 return val;
             default:
-                return SUPERUSER_ACCESS_APPS_AND_ADB;
+                return SUPERUSER_ACCESS_DISABLED;
             }
         }
         catch (Exception e) {
-            return SUPERUSER_ACCESS_APPS_AND_ADB;
+            return SUPERUSER_ACCESS_DISABLED;
         }
     }