From 88b1248701c2db1cdf1364af5585fdbd368ea793 Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Fri, 23 Sep 2016 19:52:09 -0400 Subject: [PATCH] Make it so we always return the chosen mechanism, even if we aren't using the Cyrus SASL library; this makes XOAUTH2 work without Cyrus-SASL. --- sbr/netsec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sbr/netsec.c b/sbr/netsec.c index c56de845..93218aaa 100644 --- a/sbr/netsec.c +++ b/sbr/netsec.c @@ -1378,13 +1378,7 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr) char * netsec_get_sasl_mechanism(netsec_context *nsc) { -#ifdef CYRUS_SASL return nsc->sasl_chosen_mech; -#else /* CYRUS_SASL */ - NMH_UNUSED(nsc); - - return NULL; -#endif /* CYRUS_SASL */ } /* -- 2.56.0