summaryrefslogtreecommitdiffstats
path: root/libtar/extract.c
diff options
context:
space:
mode:
authorMatt Mower <mowerm@gmail.com>2017-01-18 04:14:46 +0100
committerEthan Yonker <dees_troy@teamw.in>2017-01-18 19:40:26 +0100
commit874136434a6ef13dffec9c6c8c136d2424a32c33 (patch)
tree5875f18cd9ea090a36b692de24f29e69a2b4f65d /libtar/extract.c
parentRestore file system type logline on restore (diff)
downloadandroid_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.gz
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.bz2
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.lz
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.xz
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.zst
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.zip
Diffstat (limited to 'libtar/extract.c')
-rw-r--r--libtar/extract.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libtar/extract.c b/libtar/extract.c
index 9e24e8ee7..87ccf245f 100644
--- a/libtar/extract.c
+++ b/libtar/extract.c
@@ -32,9 +32,7 @@
# include <unistd.h>
#endif
-#ifdef HAVE_SELINUX
-# include "selinux/selinux.h"
-#endif
+#include <selinux/selinux.h>
#ifdef HAVE_EXT4_CRYPT
# include "ext4crypt_tar.h"
@@ -159,7 +157,6 @@ tar_extract_file(TAR *t, const char *realname, const char *prefix, const int *pr
return i;
}
-#ifdef HAVE_SELINUX
if((t->options & TAR_STORE_SELINUX) && t->th_buf.selinux_context != NULL)
{
#ifdef DEBUG
@@ -168,7 +165,6 @@ tar_extract_file(TAR *t, const char *realname, const char *prefix, const int *pr
if (lsetfilecon(realname, t->th_buf.selinux_context) < 0)
fprintf(stderr, "tar_extract_file(): failed to restore SELinux context %s to file %s !!!\n", t->th_buf.selinux_context, realname);
}
-#endif
if((t->options & TAR_STORE_POSIX_CAP) && t->th_buf.has_cap_data)
{