From: Richard Jones <rjones@centos5x32.home.annexia.org>
Date: Thu, 13 Aug 2009 13:43:57 +0000 (+0100)
Subject: selinux: Don't fail if libselinux is not found.
X-Git-Tag: 1.0.67~6
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=9f7bec212fc7d146b4fd4be6e8b3e98677dc0a0a;p=libguestfs.git

selinux: Don't fail if libselinux is not found.
---

diff --git a/daemon/selinux.c b/daemon/selinux.c
index ad5eaa1..3b4b9ba 100644
--- a/daemon/selinux.c
+++ b/daemon/selinux.c
@@ -30,8 +30,6 @@
 #include "daemon.h"
 #include "actions.h"
 
-#ifdef HAVE_LIBSELINUX
-
 /* setcon is only valid under the following circumstances:
  * - single threaded
  * - enforcing=0
@@ -39,7 +37,7 @@
 int
 do_setcon (const char *context)
 {
-#ifdef HAVE_SETCON
+#if defined(HAVE_LIBSELINUX) && defined(HAVE_SETCON)
   if (setcon ((char *) context) == -1) {
     reply_with_perror ("setcon");
     return -1;
@@ -55,7 +53,7 @@ do_setcon (const char *context)
 char *
 do_getcon (void)
 {
-#ifdef HAVE_GETCON
+#if defined(HAVE_LIBSELINUX) && defined(HAVE_GETCON)
   security_context_t context;
   char *r;
 
@@ -74,8 +72,6 @@ do_getcon (void)
   return r;                     /* caller frees */
 #else
   reply_with_error ("%s is not available", __func__);
-  return -1;
+  return NULL;
 #endif
 }
-
-#endif /* HAVE_LIBSELINUX */