[libgovirt] proxy: Do not overwrite certificate data from display



commit 74f9bce8be7019b1c23d6eed6b35999336f39c3e
Author: Eduardo Lima (Etrunko) <etrunko redhat com>
Date:   Thu Oct 3 17:18:58 2019 -0300

    proxy: Do not overwrite certificate data from display
    
    Since oVirt 4.3, certificate data is available from the XML see:
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1403161
    
    Previous commit adds support for using that value instead of the one
    obtained from proxy object.
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko redhat com>

 govirt/ovirt-proxy.c | 8 ++++++++
 1 file changed, 8 insertions(+)
---
diff --git a/govirt/ovirt-proxy.c b/govirt/ovirt-proxy.c
index acfc196..0c4333f 100644
--- a/govirt/ovirt-proxy.c
+++ b/govirt/ovirt-proxy.c
@@ -564,6 +564,14 @@ static void ovirt_proxy_update_vm_display_ca(OvirtProxy *proxy)
 
         g_object_get(G_OBJECT(vm), "display", &display, NULL);
         if (display != NULL) {
+            GByteArray *ca_cert = NULL;
+            g_object_get(G_OBJECT(display), "ca-cert", &ca_cert, NULL);
+            if (ca_cert != NULL) {
+                g_byte_array_unref(ca_cert);
+                ca_cert = NULL;
+                continue;
+            }
+
             g_object_set(G_OBJECT(display),
                          "ca-cert", proxy->priv->display_ca,
                          NULL);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]