Tab to space fixes, now passes 'make syntax-check'

[libguestfs.git] / daemon / selinux.c

diff --git a/daemon/selinux.c b/daemon/selinux.c
index 6e2b347..3b4b9ba 100644 (file)
--- a/daemon/selinux.c
+++ b/daemon/selinux.c
@@ -30,16 +30,14 @@
 #include "daemon.h"
 #include "actions.h"
 
-#ifdef HAVE_LIBSELINUX
-
 /* setcon is only valid under the following circumstances:
  * - single threaded
  * - enforcing=0
  */
 int
-do_setcon (char *context)
+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 (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 */