]> xenbits.xensource.com Git - libvirt.git/commitdiff
util: Fix secret generation in virStorageSourceParseRBDColonString
authorJohn Ferlan <jferlan@redhat.com>
Fri, 15 Sep 2017 19:21:35 +0000 (15:21 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Thu, 21 Sep 2017 19:46:48 +0000 (15:46 -0400)
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.

src/util/virstoragefile.c

index ba2045369c32b6fcbb659cc74c50b497ea38d0e7..484a5c8067bf91c7c3cc4c80680b11053f1593ac 100644 (file)
@@ -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;