External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 20:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

secret: Introduce secretAssignDef

Browse Source 
This new API will allocate the secret, assign the def pointer, and
insert the secret onto the passed list. Whether that's the temporary
list in loadSecrets which gets loaded into the driver list or driver
list during secretDefineXML.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-02-24 10:52:30 -05:00
parent 27950465b1
commit fa9ca7fd3c
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/secret/secret_driver.c
View File

@ -168,6 +168,22 @@ secretFindByUsage(int usageType,
return NULL; return NULL;
} }
static virSecretObjPtr
secretAssignDef(virSecretObjPtr *list,
virSecretDefPtr def)
{
virSecretObjPtr secret;
if (VIR_ALLOC(secret) < 0)
return NULL;
listInsert(list, secret);
secret->def = def;
return secret;
}
/* Permament secret storage */ /* Permament secret storage */
/* Secrets are stored in virSecretDriverStatePtr->configDir. Each secret /* Secrets are stored in virSecretDriverStatePtr->configDir. Each secret
@ -374,7 +390,8 @@ listUnlinkSecret(virSecretObjPtr *pptr,
static virSecretObjPtr static virSecretObjPtr
secretLoad(const char *file, secretLoad(virSecretObjPtr *list,
const char *file,
const char *path, const char *path,
const char *base64path) const char *base64path)
{ {
@ -387,9 +404,8 @@ secretLoad(const char *file,
if (secretLoadValidateUUID(def, file) < 0) if (secretLoadValidateUUID(def, file) < 0)
goto cleanup; goto cleanup;
if (VIR_ALLOC(secret) < 0) if (!(secret = secretAssignDef(list, def)))
goto cleanup; goto cleanup;
secret->def = def;
def = NULL; def = NULL;
if (VIR_STRDUP(secret->configFile, path) < 0) if (VIR_STRDUP(secret->configFile, path) < 0)
@ -405,6 +421,7 @@ secretLoad(const char *file,
secret = NULL; secret = NULL;
cleanup: cleanup:
listUnlinkSecret(list, secret);
secretFree(secret); secretFree(secret);
virSecretDefFree(def); virSecretDefFree(def);
return ret; return ret;
@ -449,7 +466,7 @@ loadSecrets(virSecretObjPtr *dest)
} }
VIR_FREE(base64name); VIR_FREE(base64name);
if (!(secret = secretLoad(de->d_name, path, base64path))) { if (!(secret = secretLoad(&list, de->d_name, path, base64path))) {
virErrorPtr err = virGetLastError(); virErrorPtr err = virGetLastError();
VIR_ERROR(_("Error reading secret: %s"), VIR_ERROR(_("Error reading secret: %s"),
@ -462,7 +479,6 @@ loadSecrets(virSecretObjPtr *dest)
VIR_FREE(path); VIR_FREE(path);
VIR_FREE(base64path); VIR_FREE(base64path);
listInsert(&list, secret);
} }
/* Ignore error reported by readdir, if any. It's better to keep the /* Ignore error reported by readdir, if any. It's better to keep the
secrets we managed to find. */ secrets we managed to find. */
@ -712,7 +728,7 @@ secretDefineXML(virConnectPtr conn,
unsigned int flags) unsigned int flags)
{ {
virSecretPtr ret = NULL; virSecretPtr ret = NULL;
virSecretObjPtr secret; virSecretObjPtr secret = NULL;
virSecretDefPtr backup = NULL; virSecretDefPtr backup = NULL;
virSecretDefPtr new_attrs; virSecretDefPtr new_attrs;
@ -742,7 +758,7 @@ secretDefineXML(virConnectPtr conn,
} }
/* No existing secret at all, create one */ /* No existing secret at all, create one */
if (VIR_ALLOC(secret) < 0) if (!(secret = secretAssignDef(&driver->secrets, new_attrs)))
goto cleanup; goto cleanup;
virUUIDFormat(secret->def->uuid, uuidstr); virUUIDFormat(secret->def->uuid, uuidstr);
@ -761,9 +777,6 @@ secretDefineXML(virConnectPtr conn,
secretFree(secret); secretFree(secret);
goto cleanup; goto cleanup;
} }
listInsert(&driver->secrets, secret);
secret->def = new_attrs;
} else { } else {
const char *newUsageID = secretUsageIDForDef(new_attrs); const char *newUsageID = secretUsageIDForDef(new_attrs);
const char *oldUsageID = secretUsageIDForDef(secret->def); const char *oldUsageID = secretUsageIDForDef(secret->def);