From: "Daniel P. Berrange" <berra...@redhat.com>
Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
---
configure.ac | 4 ++--
src/lxc/lxc_container.c | 2 +-
src/storage/storage_backend.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index fd214eb..c3b2b13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1243,12 +1243,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 9bc5610..0ae46d7 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -522,7 +522,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 df3833a..34c3fc4 100644
--- 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
@@ -1161,7 +1161,7 @@
virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target,
unsigned long long *capacity)
{
struct stat sb;
-#if HAVE_SELINUX
+#if WITH_SELINUX
security_context_t filecon = NULL;
#endif
@@ -1225,7 +1225,7 @@
virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target,
VIR_FREE(target->perms.label);
-#if HAVE_SELINUX
+#if WITH_SELINUX
/* XXX: make this a security driver call */
if (fgetfilecon(fd, &filecon) == -1) {
if (errno != ENODATA && errno != ENOTSUP) {
--
1.7.11.4
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
