From: Wido den Hollander <wido@widodh.nl>
Date: Mon, 25 Jun 2012 15:44:01 +0000 (+0200)
Subject: qemu: Always set auth_supported for Ceph disks.
X-Git-Tag: CVE-2012-3445~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccb94785007d33365d49dd566e194eb0a022148d;p=thirdparty%2Flibvirt.git

qemu: Always set auth_supported for Ceph disks.

Recently the Ceph project defaulted auth_supported from 'none' to 'cephx'.

When no auth information was set for Ceph disks this would lead to librados defaulting to
'cephx', but there would be no additional authorization information.

We now explicitly set auth_supported to none when passing down arguments to Qemu.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 528b189352..94b2919f52 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1782,6 +1782,8 @@ qemuBuildRBDString(virConnectPtr conn,
                             disk->auth.username);
             goto error;
         }
+    } else {
+        virBufferAddLit(opt, ":auth_supported=none");
     }
 
     if (disk->nhosts > 0) {