Changeset b006464 for protocols/jabber/jabber.c

Timestamp:

2012-11-17T23:51:21Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5aa96fc8

Parents:

d1356cb (diff), e1d3f98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

File:

• protocols/jabber/jabber.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -231 +231 @@
         if( set_getbool( &acc->set, "ssl" ) )
         {
-                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), FALSE, jabber_connected_ssl, ic );
+                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), set_getbool( &acc->set, "tls_verify" ), jabber_connected_ssl, ic );
                 jd->fd = jd->ssl ? ssl_getfd( jd->ssl ) : -1;
         }