From: John Ferlan <jferlan@redhat.com>
Date: Fri, 15 Sep 2017 19:21:35 +0000 (-0400)
Subject: util: Fix secret generation in virStorageSourceParseRBDColonString
X-Git-Tag: v3.8.0-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffdce9b1f1a5c59b928222b886488e28d4a03590;p=thirdparty%2Flibvirt.git

util: Fix secret generation in virStorageSourceParseRBDColonString

Commit id '5604c056' used the wrong API to generate the
<secret type='%s'..." field. The previous code used the
correct API as was done in commit id '6887af39'. The data
is actually a usage type not an auth type even though the
result is the same.
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index ba2045369c..484a5c8067 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -44,6 +44,7 @@
 #include "virbuffer.h"
 #include "virjson.h"
 #include "virstorageencryption.h"
+#include "virsecret.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
@@ -2547,7 +2548,7 @@ virStorageSourceParseRBDColonString(const char *rbdstr,
                 goto error;
 
             if (VIR_STRDUP(authdef->secrettype,
-                           virStorageAuthTypeToString(VIR_STORAGE_AUTH_TYPE_CEPHX)) < 0)
+                           virSecretUsageTypeToString(VIR_SECRET_USAGE_TYPE_CEPH)) < 0)
                 goto error;
             src->auth = authdef;
             authdef = NULL;