From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 30 Aug 2012 14:05:53 +0000 (+0200)
Subject: security: Re-apply commit ce53382ba28179d3a504b29b4f888b6e130d53f0
X-Git-Tag: v0.10.1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1497e36db97e257bbdb037066994aac5ca3e75f6;p=thirdparty%2Flibvirt.git

security: Re-apply commit ce53382ba28179d3a504b29b4f888b6e130d53f0

Recent changes in the security driver discarded changes that fixed
labeling un-confined guests.
---

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index 367f7adff9..07f5a9ba7f 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -340,10 +340,12 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr,
         }
 
         if (seclabel->type == VIR_DOMAIN_SECLABEL_DEFAULT) {
-            if (sec_managers[i]->defaultConfined)
+            if (sec_managers[i]->defaultConfined) {
                 seclabel->type = VIR_DOMAIN_SECLABEL_DYNAMIC;
-            else
+            } else {
                 seclabel->type = VIR_DOMAIN_SECLABEL_NONE;
+                seclabel->norelabel = true;
+            }
         }
 
         if ((seclabel->type == VIR_DOMAIN_SECLABEL_NONE) &&