On 08/10/2012 07:47 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange(a)redhat.com>
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(a)redhat.com>
---
src/security/security_driver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 7ff5f17..f450a94 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)) {
Possibly simpler as 'if (STREQ_NULLABLE(tmp->name, name))'
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Security driver %s not enabled"),
+ name);
+ return NULL;
+ }
ACK, whether or not you micro-optimize.
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org