summaryrefslogtreecommitdiffstats
path: root/minzip/DirUtil.c
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-09-10 20:20:39 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-10 20:20:39 +0200
commit863f4ef587fad3c7263fc5bb66e69d088307f154 (patch)
treef4d79a3a987132aa024da2592e552bfc78b1980d /minzip/DirUtil.c
parentallow CheckKey to request mounting /system (diff)
parentam 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels" (diff)
downloadandroid_bootable_recovery-863f4ef587fad3c7263fc5bb66e69d088307f154.tar
android_bootable_recovery-863f4ef587fad3c7263fc5bb66e69d088307f154.tar.gz
android_bootable_recovery-863f4ef587fad3c7263fc5bb66e69d088307f154.tar.bz2
android_bootable_recovery-863f4ef587fad3c7263fc5bb66e69d088307f154.tar.lz
android_bootable_recovery-863f4ef587fad3c7263fc5bb66e69d088307f154.tar.xz
android_bootable_recovery-863f4ef587fad3c7263fc5bb66e69d088307f154.tar.zst
android_bootable_recovery-863f4ef587fad3c7263fc5bb66e69d088307f154.zip
Diffstat (limited to 'minzip/DirUtil.c')
-rw-r--r--minzip/DirUtil.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/minzip/DirUtil.c b/minzip/DirUtil.c
index c120fa3cd..8dd5da1da 100644
--- a/minzip/DirUtil.c
+++ b/minzip/DirUtil.c
@@ -23,7 +23,6 @@
#include <errno.h>
#include <dirent.h>
#include <limits.h>
-#include <selinux/selinux.h>
#include "DirUtil.h"
@@ -238,7 +237,7 @@ dirUnlinkHierarchy(const char *path)
int
dirSetHierarchyPermissions(const char *path,
- int uid, int gid, int dirMode, int fileMode, const char* secontext)
+ int uid, int gid, int dirMode, int fileMode)
{
struct stat st;
if (lstat(path, &st)) {
@@ -256,10 +255,6 @@ dirSetHierarchyPermissions(const char *path,
return -1;
}
- if ((secontext != NULL) && lsetfilecon(path, secontext) && (errno != ENOTSUP)) {
- return -1;
- }
-
/* recurse over directory components */
if (S_ISDIR(st.st_mode)) {
DIR *dir = opendir(path);
@@ -276,7 +271,7 @@ dirSetHierarchyPermissions(const char *path,
char dn[PATH_MAX];
snprintf(dn, sizeof(dn), "%s/%s", path, de->d_name);
- if (!dirSetHierarchyPermissions(dn, uid, gid, dirMode, fileMode, secontext)) {
+ if (!dirSetHierarchyPermissions(dn, uid, gid, dirMode, fileMode)) {
errno = 0;
} else if (errno == 0) {
errno = -1;