From 3007aeb160913193e88d850e455d5e6fe0b3ec4b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 2 Feb 2014 11:49:43 -0500 Subject: [PATCH] build: Fix --without-selinux case --- src/libostree/ostree-sysroot-deploy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index 69a2b7f4..4da39a62 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -503,8 +503,10 @@ init_labeling_context (GFile *deployment_etc, static void ostree_labeling_context_cleanup (OstreeLabelingContext *secontext) { +#ifdef HAVE_SELINUX if (secontext->hnd) selabel_close (secontext->hnd); +#endif } static gboolean @@ -545,6 +547,7 @@ selinux_relabel_dir (OstreeSysroot *sysroot, #endif } +#ifdef HAVE_SELINUX static gboolean selinux_relabel_file (OstreeLabelingContext *secontext, GFile *path, @@ -552,7 +555,6 @@ selinux_relabel_file (OstreeLabelingContext *secontext, GCancellable *cancellable, GError **error) { -#ifdef HAVE_SELINUX gboolean ret = FALSE; if (secontext->have_policy) @@ -578,10 +580,8 @@ selinux_relabel_file (OstreeLabelingContext *secontext, ret = TRUE; out: return ret; -#else - return TRUE; -#endif } +#endif static gboolean selinux_relabel_var_if_needed (OstreeSysroot *sysroot,