commit 27a93650c0df02e4cd3c48bbec8acee8b817a012
author Stephen Smalley <sds@tycho.nsa.gov> Fri Feb 07 09:14:13 2014 -0500
committer Stephen Smalley <sds@tycho.nsa.gov> Fri Feb 07 09:38:32 2014 -0500
tree 5e44f37904161863c288b4c4734d7dabd3b3b94c
parent 71de56a08cac3353334c2253748fdf8c37ec4aa1

Convert all selinux_android_restorecon and _setfilecon calls to new API.

libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

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 c630020..e598ab4 100755
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -741,7 +741,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));