From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 10 Aug 2012 13:04:17 +0000 (+0100)
Subject: Use VIR_ERR_CONFIG_UNSUPPORTED if requested security driver is disabled
X-Git-Tag: v0.10.0-rc1~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51b23ed31a5915ed437e4dd149bc4c8e04a4bcc4;p=thirdparty%2Flibvirt.git

Use VIR_ERR_CONFIG_UNSUPPORTED if requested security driver is disabled

There is currently no way to distinguish the case that a requested
security driver was disabled, from the case where no security driver
was available. Use VIR_ERR_CONFIG_UNSUPPORTED as the error when an
explicitly requested security driver was disabled

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

diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 7ff5f1786d..f450a94372 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -72,6 +72,12 @@ virSecurityDriverPtr virSecurityDriverLookup(const char *name,
 
         case SECURITY_DRIVER_DISABLE:
             VIR_DEBUG("Not enabled name=%s", tmp->name);
+            if (name && STREQ(tmp->name, name)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("Security driver %s not enabled"),
+                               name);
+                return NULL;
+            }
             break;
 
         default: