Convert HAVE_SELINUX to WITH_SELINUX

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/configure.ac b/configure.ac
index f2b59efbb2d417271fba04f34cb1d9dae4ec0b3e..b50e32929607ca639a013f16fa0ccdc6a602d7c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1291,12 +1291,12 @@ if test "$with_selinux" = "yes"; then
 
   SELINUX_LIBS="-lselinux"
   AC_DEFINE_UNQUOTED([SELINUX_MOUNT], ["$SELINUX_MOUNT"], [SELinux mount point])
-  AC_DEFINE_UNQUOTED([HAVE_SELINUX], 1, [whether basic SELinux functionality is available])
+  AC_DEFINE_UNQUOTED([WITH_SELINUX], 1, [whether basic SELinux functionality is available])
   dnl We prefer to use <selinux/label.h> and selabel_open, but can fall
   dnl back to matchpathcon for the sake of RHEL 5's version of libselinux.
   AC_CHECK_HEADERS([selinux/label.h])
 fi
-AM_CONDITIONAL([HAVE_SELINUX], [test "$with_selinux" != "no"])
+AM_CONDITIONAL([WITH_SELINUX], [test "$with_selinux" != "no"])
 AC_SUBST([SELINUX_CFLAGS])
 AC_SUBST([SELINUX_LIBS])
 

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 9f229238a6f6bce181a9f2c8abf51f7baf0b7d12..ee1d6764123f677108579641783a9a0488cd58c9 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -524,7 +524,7 @@ static int lxcContainerMountBasicFS(bool pivotRoot,
         { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
         { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
         { "sysfs", "/sys", "sysfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
-#if HAVE_SELINUX
+#if WITH_SELINUX
         { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
         { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
 #endif

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index df79b28dbeb9eea1dbe17e7c5f4072561a032769..c2c4c5111fd1f0cdcd911e61eaf691fd1c98f3e0 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -41,7 +41,7 @@
 # include <linux/fs.h>
 #endif
 
-#if HAVE_SELINUX
+#if WITH_SELINUX
 # include <selinux/selinux.h>
 #endif
 
@@ -1177,7 +1177,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target,
                                        unsigned long long *capacity)
 {
     struct stat sb;
-#if HAVE_SELINUX
+#if WITH_SELINUX
     security_context_t filecon = NULL;
 #endif
 
@@ -1241,7 +1241,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target,
 
     VIR_FREE(target->perms.label);
 
-#if HAVE_SELINUX
+#if WITH_SELINUX
     /* XXX: make this a security driver call */
     if (fgetfilecon_raw(fd, &filecon) == -1) {
         if (errno != ENODATA && errno != ENOTSUP) {