[Spice-commits] src/spice-channel.c

Christophe Fergau teuf at kemper.freedesktop.org
Wed Aug 5 02:53:43 PDT 2015


 src/spice-channel.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3b99d65841bc842a5c9625e75edaa8f5c4e7b877
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Aug 3 18:25:17 2015 +0200

    channel: Don't warn when no CA is set
    
    Since v0.22~19 "Use system-wide trust certificate store", when neither
    SpiceSession::ca-file nor SpiceSession::ca are set, the system-wide
    CA store will be used to validate the SPICE certificates.
    However, there is still a g_warn_if_fail() checking that either ca or
    ca-file are set, which causes a runtime warning when trying to use the
    system-wide store. This commit removes it.

diff --git a/src/spice-channel.c b/src/spice-channel.c
index c67e0aa..e254b41 100644
--- a/src/spice-channel.c
+++ b/src/spice-channel.c
@@ -2242,7 +2242,6 @@ static int spice_channel_load_ca(SpiceChannel *channel)
     spice_session_get_ca(c->session, &ca, &size);
 
     CHANNEL_DEBUG(channel, "Load CA, file: %s, data: %p", ca_file, ca);
-    g_warn_if_fail(ca_file || ca);
 
     if (ca != NULL) {
         in = BIO_new_mem_buf(ca, size);


More information about the Spice-commits mailing list