From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 23 Sep 2016 23:52:09 +0000 (-0400)
Subject: Make it so we always return the chosen mechanism, even if we aren't
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/88b1248701c2db1cdf1364af5585fdbd368ea793?ds=inline

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.
---

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 */
 }
 
 /*