diff options
author | James Booth <boothj5@gmail.com> | 2015-10-18 00:17:45 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-10-18 00:17:45 +0100 |
commit | 9d2745e462eabafcab51e04ec9ad225a13cf9a6f (patch) | |
tree | c27b019ad93cfee1da7a9b02152b6bcf32ae95ca /src/xmpp | |
parent | 31ecd41c8fd69fbe7a62e97b0cc5e2583e3447e3 (diff) | |
download | profani-tty-9d2745e462eabafcab51e04ec9ad225a13cf9a6f.tar.gz |
Removed --disable-tls command line option
Diffstat (limited to 'src/xmpp')
-rw-r--r-- | src/xmpp/connection.c | 7 | ||||
-rw-r--r-- | src/xmpp/xmpp.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 5a27a63e..fa29a70e 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -70,7 +70,6 @@ static struct _jabber_conn_t { jabber_conn_status_t conn_status; char *presence_message; int priority; - int tls_disabled; char *domain; } jabber_conn; @@ -115,14 +114,13 @@ void _connection_free_saved_details(void); void _connection_free_session_data(void); void -jabber_init(const int disable_tls) +jabber_init(void) { log_info("Initialising XMPP"); jabber_conn.conn_status = JABBER_STARTED; jabber_conn.presence_message = NULL; jabber_conn.conn = NULL; jabber_conn.ctx = NULL; - jabber_conn.tls_disabled = disable_tls; jabber_conn.domain = NULL; presence_sub_requests_init(); caps_init(); @@ -430,9 +428,6 @@ _jabber_connect(const char * const fulljid, const char * const passwd, } xmpp_conn_set_jid(jabber_conn.conn, fulljid); xmpp_conn_set_pass(jabber_conn.conn, passwd); - if (jabber_conn.tls_disabled) { - xmpp_conn_disable_tls(jabber_conn.conn); - } #ifdef HAVE_LIBMESODE char *cert_path = prefs_get_string(PREF_TLS_CERTPATH); diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 839df9a7..ddf83c64 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -137,7 +137,7 @@ typedef struct data_form_t { } DataForm; // connection functions -void jabber_init(const int disable_tls); +void jabber_init(void); jabber_conn_status_t jabber_connect_with_details(const char * const jid, const char * const passwd, const char * const altdomain, const int port); jabber_conn_status_t jabber_connect_with_account(const ProfAccount * const account); |