From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 20 Mar 2013 19:01:18 +0000 (+0100)
Subject: Don't fail if SELinux is diabled
X-Git-Tag: v1.0.4-rc1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82eec793c7a3ac470b156d36e9533087ca1f7d2b;p=thirdparty%2Flibvirt.git

Don't fail if SELinux is diabled

but libvirt is built with --with-selinux. In this case getpeercon
returns ENOPROTOOPT so don't return an error in that case but simply
don't set seccon.
---

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 39504ac6e9..c4fd9ee981 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -1171,7 +1171,7 @@ int virNetSocketGetSecurityContext(virNetSocketPtr sock,
 
     virObjectLock(sock);
     if (getpeercon(sock->fd, &seccon) < 0) {
-        if (errno == ENOSYS) {
+        if (errno == ENOSYS || errno == ENOPROTOOPT) {
             ret = 0;
             goto cleanup;
         }