From 424918c5ede603c07bcc4635906e0ee942c1d6e9 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Thu, 11 Jun 2020 02:51:07 +0300 Subject: Make legacy auth optional Some systems don't provide recent libstrophe releases. When older version of libstrophe is detected, don't build legacy auth support. To simplify this patch, report about unsupported legacy auth and keep commands option as is. --- src/xmpp/connection.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src') diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 78f72579..e6d72d84 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -59,6 +59,7 @@ #include "xmpp/connection.h" #include "xmpp/session.h" #include "xmpp/iq.h" +#include "ui/ui.h" typedef struct prof_conn_t { xmpp_log_t *xmpp_log; @@ -191,7 +192,13 @@ connection_connect(const char *const jid, const char *const passwd, const char * } if (auth_policy && (g_strcmp0(auth_policy, "legacy") == 0)) { +#ifdef HAVE_LIBSTROPHE_LT_0_9_3 + log_warning("Legacy authentication is requested, but it hasn't been " + "built. Update libstrophe and rebuild Profanity."); + cons_show("Legacy authentication is requested, but it hasn't been built."); +#else flags |= XMPP_CONN_FLAG_LEGACY_AUTH; +#endif /* HAVE_LIBSTROPHE_LT_0_9_3 */ } xmpp_conn_set_flags(conn.xmpp_conn, flags); @@ -204,7 +211,9 @@ connection_connect(const char *const jid, const char *const passwd, const char * LOG_FLAG_IF_SET(XMPP_CONN_FLAG_TRUST_TLS); LOG_FLAG_IF_SET(XMPP_CONN_FLAG_DISABLE_TLS); LOG_FLAG_IF_SET(XMPP_CONN_FLAG_LEGACY_SSL); +#ifndef HAVE_LIBSTROPHE_LT_0_9_3 LOG_FLAG_IF_SET(XMPP_CONN_FLAG_LEGACY_AUTH); +#endif /* HAVE_LIBSTROPHE_LT_0_9_3 */ #undef LOG_FLAG_IF_SET } -- cgit 1.4.1-2-gfad0