commit 6e94c5764b1775a0e4f122cf3925c46815029ccb
author Nick Kralevich <nnk@google.com> Fri Mar 07 02:29:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 02:29:38 2014 +0000
tree 29ad445e86e8a60d42b6534f2146e578f0fe7eb1
parent a8a427d1803c4cd99e4c125a5bd8c1e093d4c546
parent 2e7347d617b02b13d227bb4cecf6bd69b7b20fa9

am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '2e7347d617b02b13d227bb4cecf6bd69b7b20fa9':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.

adb/file_sync_service.c

diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c
index 577fb8f..e981c2a 100644
--- a/adb/file_sync_service.c
+++ b/adb/file_sync_service.c
@@ -68,7 +68,7 @@
                 *x = '/';
                 return ret;
             }
-            selinux_android_restorecon(name);
+            selinux_android_restorecon(name, 0);
         }
         *x++ = '/';
     }
@@ -246,7 +246,7 @@
     if(fd >= 0) {
         struct utimbuf u;
         adb_close(fd);
-        selinux_android_restorecon(path);
+        selinux_android_restorecon(path, 0);
         u.actime = timestamp;
         u.modtime = timestamp;
         utime(path, &u);

debuggerd/tombstone.cpp

diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 91d95fc..6a1b963 100755
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -732,7 +732,7 @@
       LOG("failed to change ownership of %s: %s\n", TOMBSTONE_DIR, strerror(errno));
   }
 
-  if (selinux_android_restorecon(TOMBSTONE_DIR) == -1) {
+  if (selinux_android_restorecon(TOMBSTONE_DIR, 0) == -1) {
     *detach_failed = false;
     return NULL;
   }

init/util.c

diff --git a/init/util.c b/init/util.c
index e772342..0f69e1c 100644
--- a/init/util.c
+++ b/init/util.c
@@ -527,10 +527,10 @@
 
 int restorecon(const char* pathname)
 {
-    return selinux_android_restorecon(pathname);
+    return selinux_android_restorecon(pathname, 0);
 }
 
 int restorecon_recursive(const char* pathname)
 {
-    return selinux_android_restorecon_recursive(pathname);
+    return selinux_android_restorecon(pathname, SELINUX_ANDROID_RESTORECON_RECURSE);
 }

toolbox/restorecon.c

diff --git a/toolbox/restorecon.c b/toolbox/restorecon.c
index 137e9fa..11532da 100644
--- a/toolbox/restorecon.c
+++ b/toolbox/restorecon.c
@@ -49,7 +49,7 @@
         usage();
 
     for (i = 0; i < argc; i++) {
-        rc = selinux_android_restorecon_flags(argv[i], flags);
+        rc = selinux_android_restorecon(argv[i], flags);
         if (rc < 0)
             fprintf(stderr, "Could not restorecon %s:  %s\n", argv[i],
                     strerror(errno));