[Spice-devel] [spice-gtk] channel: Don't warn when no CA is set

[Christophe Fergeau]

On Tue, Aug 04, 2015 at 06:23:30PM +0200, Fabiano Fidêncio wrote:
> On Mon, Aug 3, 2015 at 6:28 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> > 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.
> > ---
> >  src/spice-channel.c | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > 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);
> > --
> > 2.4.3
> >
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
> 
> ACK!

Thanks, pushed.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150805/c3ccb256/attachment.sig>