Use 'virTypedParamListFetch' for extracting identity parameters list

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/driver.c b/src/driver.c
index c7a9c2659f0c361879a92d14ede19af36acdd8e3..35f81566058f90cd0597e7d9f25f9477bcacfe76 100644 (file)
--- a/src/driver.c
+++ b/src/driver.c
@@ -165,8 +165,13 @@ virGetConnectGeneric(virThreadLocal *threadPtr, const char *name)
             ident = virIdentityGetCurrent();
             if (ident) {
                 g_autoptr(virTypedParamList) tmp = virIdentityGetParameters(ident);
+                virTypedParameterPtr par;
+                size_t npar;
 
-                if (virConnectSetIdentity(conn, tmp->par, tmp->npar, 0) < 0)
+                if (virTypedParamListFetch(tmp, &par, &npar) < 0)
+                    goto error;
+
+                if (virConnectSetIdentity(conn, par, npar, 0) < 0)
                     goto error;
             }
         }

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 4fc83dbd90ae480b229f62cf973eedf21f8fcdfc..7144e9e7ca64047ce815bb24e3cb1734090ec828 100644 (file)
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -1824,7 +1824,13 @@ remoteOpenConn(const char *uri,
     VIR_DEBUG("Opened driver %p", newconn);
 
     if (preserveIdentity) {
-        if (virConnectSetIdentity(newconn, identparams->par, identparams->npar, 0) < 0)
+        virTypedParameterPtr par;
+        size_t npar;
+
+        if (virTypedParamListFetch(identparams, &par, &npar) < 0)
+            return -1;
+
+        if (virConnectSetIdentity(newconn, par, npar, 0) < 0)
             return -1;
 
         VIR_DEBUG("Forwarded current identity to secondary driver");