From 9a53854a1d196e79a031c28b7a6013ac41c58c4c Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 22 Sep 2015 21:55:46 +0100 Subject: Added conditionals for libmesode cert verification --- src/xmpp/connection.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index be60ad21..c6d04079 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -360,12 +360,14 @@ _connection_free_session_data(void) presence_clear_sub_requests(); } +#ifdef HAVE_LIBMESODE static int _connection_certfail_cb(const char * const certname, const char * const certfp, char * const notbefore, const char * const notafter, const char * const errormsg) { return sv_ev_certfail(errormsg, certname, certfp, notbefore, notafter); } +#endif static jabber_conn_status_t _jabber_connect(const char * const fulljid, const char * const passwd, @@ -417,8 +419,13 @@ _jabber_connect(const char * const fulljid, const char * const passwd, xmpp_conn_disable_tls(jabber_conn.conn); } +#ifdef HAVE_LIBMESODE int connect_status = xmpp_connect_client(jabber_conn.conn, altdomain, port, _connection_certfail_cb, _connection_handler, jabber_conn.ctx); +#else + int connect_status = xmpp_connect_client(jabber_conn.conn, altdomain, port, + _connection_handler, jabber_conn.ctx); +#endif if (connect_status == 0) jabber_conn.conn_status = JABBER_CONNECTING; -- cgit 1.4.1-2-gfad0