From f07f9733cb805065c019cf2fad6730e544dabb1c Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 20 Mar 2013 13:06:04 +0000
Subject: [PATCH] Fix typos s/HAVE_SELINUX/WITH_SELINUX/

The virNetSocket & virIdentity classes accidentally got some
conditionals using HAVE_SELINUX instead of WITH_SELINUX.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 src/rpc/virnetsocket.c | 8 ++++----
 src/util/viridentity.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 68aca1b2e9..39504ac6e9 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -40,7 +40,7 @@
 #endif
 
 #include "c-ctype.h"
-#ifdef HAVE_SELINUX
+#ifdef WITH_SELINUX
 # include <selinux/selinux.h>
 #endif
 
@@ -1160,7 +1160,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,
 }
 #endif
 
-#ifdef HAVE_SELINUX
+#ifdef WITH_SELINUX
 int virNetSocketGetSecurityContext(virNetSocketPtr sock,
                                    char **context)
 {
@@ -1169,7 +1169,7 @@ int virNetSocketGetSecurityContext(virNetSocketPtr sock,
 
     *context = NULL;
 
-    virMutexLock(&sock->lock);
+    virObjectLock(sock);
     if (getpeercon(sock->fd, &seccon) < 0) {
         if (errno == ENOSYS) {
             ret = 0;
@@ -1188,7 +1188,7 @@ int virNetSocketGetSecurityContext(virNetSocketPtr sock,
     ret = 0;
 cleanup:
     freecon(seccon);
-    virMutexUnlock(&sock->lock);
+    virObjectUnlock(sock);
     return ret;
 }
 #else
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index 20921374f1..1d40972a6e 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <unistd.h>
-#if HAVE_SELINUX
+#if WITH_SELINUX
 # include <selinux/selinux.h>
 #endif
 
@@ -135,7 +135,7 @@ virIdentityPtr virIdentityGetSystem(void)
     char *groupname = NULL;
     char *seccontext = NULL;
     virIdentityPtr ret = NULL;
-#if HAVE_SELINUX
+#if WITH_SELINUX
     security_context_t con;
 #endif
 
@@ -144,7 +144,7 @@ virIdentityPtr virIdentityGetSystem(void)
     if (!(groupname = virGetGroupName(getgid())))
         goto cleanup;
 
-#if HAVE_SELINUX
+#if WITH_SELINUX
     if (getcon(&con) < 0) {
         virReportSystemError(errno, "%s",
                              _("Unable to lookup SELinux process context"));
-- 
GitLab