From: John Ferlan <jferlan@redhat.com>
Date: Sat, 13 Jul 2013 18:15:15 +0000 (-0400)
Subject: storage_conf: Introduce virStoragePoolAuthSecretPtr
X-Git-Tag: CVE-2013-4154~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92c5591fd284328b7b278c955766a3c76f833f59;p=thirdparty%2Flibvirt.git

storage_conf: Introduce virStoragePoolAuthSecretPtr

Split out the _virStoragePoolAuthSecret data from _virStoragePoolAuthCephx
into its own structure
---

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 98339ef973..5fbecf4874 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -151,6 +151,14 @@ enum virStoragePoolAuthType {
 };
 VIR_ENUM_DECL(virStoragePoolAuthType)
 
+typedef struct _virStoragePoolAuthSecret virStoragePoolAuthSecret;
+typedef virStoragePoolAuthSecret *virStoragePoolAuthSecretPtr;
+struct _virStoragePoolAuthSecret {
+    unsigned char uuid[VIR_UUID_BUFLEN];
+    char *usage;
+    bool uuidUsable;
+};
+
 typedef struct _virStoragePoolAuthChap virStoragePoolAuthChap;
 typedef virStoragePoolAuthChap *virStoragePoolAuthChapPtr;
 struct _virStoragePoolAuthChap {
@@ -162,11 +170,7 @@ typedef struct _virStoragePoolAuthCephx virStoragePoolAuthCephx;
 typedef virStoragePoolAuthCephx *virStoragePoolAuthCephxPtr;
 struct _virStoragePoolAuthCephx {
     char *username;
-    struct {
-            unsigned char uuid[VIR_UUID_BUFLEN];
-            char *usage;
-            bool uuidUsable;
-    } secret;
+    virStoragePoolAuthSecret secret;
 };
 
 /*