diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2014-08-15 10:58:56 -0500 |
|---|---|---|
| committer | Jonathon Jongsma <jjongsma@redhat.com> | 2014-08-15 11:22:59 -0500 |
| commit | 8b7f5db57356d3adca864585efe672a830ce5b87 (patch) | |
| tree | e25336a15a604004af36c580d117e2cdd5131de5 /src/virt-viewer-session-spice.c | |
| parent | 0ca9959f00d4970b4398d48b77fd3f08f78a1855 (diff) | |
| download | virt-viewer-8b7f5db57356d3adca864585efe672a830ce5b87.tar.gz virt-viewer-8b7f5db57356d3adca864585efe672a830ce5b87.tar.xz virt-viewer-8b7f5db57356d3adca864585efe672a830ce5b87.zip | |
Don't use fallback ca-file when launching vv-file
When launching from a vv-file, we want to use the ca specified in the vv
file and not load additional certs from the fallback ca-file. This
ensures that the ca-file property of the spice session is unset when
loading a ca from a vv-file.
Resolves: rhbz#1127762
Diffstat (limited to 'src/virt-viewer-session-spice.c')
| -rw-r--r-- | src/virt-viewer-session-spice.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c index b6886be..c1cd2f9 100644 --- a/src/virt-viewer-session-spice.c +++ b/src/virt-viewer-session-spice.c @@ -365,7 +365,10 @@ fill_session(VirtViewerFile *file, SpiceSession *session) g_return_if_fail(ca != NULL); GByteArray *ba = g_byte_array_new_take((guint8 *)ca, strlen(ca) + 1); - g_object_set(G_OBJECT(session), "ca", ba, NULL); + g_object_set(G_OBJECT(session), + "ca", ba, + "ca-file", NULL, + NULL); g_byte_array_unref(ba); } |