Blame SOURCES/0067-Don-t-use-fallback-ca-file-when-launching-vv-file.patch
|
 |
4ab194 |
From e63dd36d1468cc089b74cb04fbf9d80b47988ca4 Mon Sep 17 00:00:00 2001
|
|
|
4ab194 |
From: Jonathon Jongsma <jjongsma@redhat.com>
|
|
|
4ab194 |
Date: Fri, 15 Aug 2014 10:58:56 -0500
|
|
|
4ab194 |
Subject: [PATCH] Don't use fallback ca-file when launching vv-file
|
|
|
4ab194 |
|
|
|
4ab194 |
When launching from a vv-file, we want to use the ca specified in the vv
|
|
|
4ab194 |
file and not load additional certs from the fallback ca-file. This
|
|
|
4ab194 |
ensures that the ca-file property of the spice session is unset when
|
|
|
4ab194 |
loading a ca from a vv-file.
|
|
|
4ab194 |
|
|
|
4ab194 |
Resolves: rhbz#1127762
|
|
|
4ab194 |
---
|
|
|
4ab194 |
src/virt-viewer-session-spice.c | 5 ++++-
|
|
|
4ab194 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
4ab194 |
|
|
|
4ab194 |
diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c
|
|
|
4ab194 |
index 58a1dd7..ceef067 100644
|
|
|
4ab194 |
--- a/src/virt-viewer-session-spice.c
|
|
|
4ab194 |
+++ b/src/virt-viewer-session-spice.c
|
|
|
4ab194 |
@@ -359,7 +359,10 @@ fill_session(VirtViewerFile *file, SpiceSession *session)
|
|
|
4ab194 |
g_return_if_fail(ca != NULL);
|
|
|
4ab194 |
|
|
|
4ab194 |
GByteArray *ba = g_byte_array_new_take((guint8 *)ca, strlen(ca) + 1);
|
|
|
4ab194 |
- g_object_set(G_OBJECT(session), "ca", ba, NULL);
|
|
|
4ab194 |
+ g_object_set(G_OBJECT(session),
|
|
|
4ab194 |
+ "ca", ba,
|
|
|
4ab194 |
+ "ca-file", NULL,
|
|
|
4ab194 |
+ NULL);
|
|
|
4ab194 |
g_byte_array_unref(ba);
|
|
|
4ab194 |
}
|
|
|
4ab194 |
|