commit 3328e3bc81161c2a57ea94d304162276facdd826
author Nick Kralevich <nnk@google.com> Mon Sep 09 10:47:14 2013 -0700
committer Nick Kralevich <nnk@google.com> Mon Sep 09 10:47:14 2013 -0700
tree ecd8762bc38d8db05b1175ec392ae3ed54cbd0a8
parent 3b5a987cd7fd76c038e9875b430028216d21ace3

Revert "Update OTA installer to understand SELinux filesystem labels"

This reverts commit 627eb30f73c29257acaeb6568f3da38880784f7c.

Bug: 10183961
Bug: 10186213

updater/install.c

diff --git a/updater/install.c b/updater/install.c
index c81bbb5..9fa06a2 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
-#include <selinux/selinux.h>
 
 #include "cutils/misc.h"
 #include "cutils/properties.h"
@@ -522,10 +521,9 @@
 
 Value* SetPermFn(const char* name, State* state, int argc, Expr* argv[]) {
     char* result = NULL;
-    bool recursive = (strcmp(name, "set_perm_recursive") == 0) || (strcmp(name, "set_perm2_recursive") == 0);
-    bool has_selabel = (strcmp(name, "set_perm2") == 0) || (strcmp(name, "set_perm2_recursive") == 0);
+    bool recursive = (strcmp(name, "set_perm_recursive") == 0);
 
-    int min_args = 4 + (has_selabel ? 1 : 0) + (recursive ? 1 : 0);
+    int min_args = 4 + (recursive ? 1 : 0);
     if (argc < min_args) {
         return ErrorAbort(state, "%s() expects %d+ args, got %d",
                           name, min_args, argc);
@@ -564,13 +562,8 @@
             goto done;
         }
 
-        char* secontext = NULL;
-        if (has_selabel) {
-            secontext = args[4];
-        }
-
-        for (i = 4 + (has_selabel ? 1 : 0); i < argc; ++i) {
-            dirSetHierarchyPermissions(args[i], uid, gid, dir_mode, file_mode, secontext);
+        for (i = 4; i < argc; ++i) {
+            dirSetHierarchyPermissions(args[i], uid, gid, dir_mode, file_mode);
         }
     } else {
         int mode = strtoul(args[2], &end, 0);
@@ -579,12 +572,7 @@
             goto done;
         }
 
-        char* secontext = NULL;
-        if (has_selabel) {
-            secontext = args[3];
-        }
-
-        for (i = 3 + (has_selabel ? 1 : 0); i < argc; ++i) {
+        for (i = 3; i < argc; ++i) {
             if (chown(args[i], uid, gid) < 0) {
                 printf("%s: chown of %s to %d %d failed: %s\n",
                         name, args[i], uid, gid, strerror(errno));
@@ -595,11 +583,6 @@
                         name, args[i], mode, strerror(errno));
                 ++bad;
             }
-            if (has_selabel && lsetfilecon(args[i], secontext) && (errno != ENOTSUP)) {
-                printf("%s: lsetfilecon of %s to %s failed: %s\n",
-                        name, args[i], secontext, strerror(errno));
-                ++bad;
-            }
         }
     }
     result = strdup("");
@@ -1152,8 +1135,6 @@
     RegisterFunction("symlink", SymlinkFn);
     RegisterFunction("set_perm", SetPermFn);
     RegisterFunction("set_perm_recursive", SetPermFn);
-    RegisterFunction("set_perm2", SetPermFn);
-    RegisterFunction("set_perm2_recursive", SetPermFn);
 
     RegisterFunction("getprop", GetPropFn);
     RegisterFunction("file_getprop", FileGetPropFn);