From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 30 Sep 2017 14:06:30 +0000 (+0800)
Subject: Switch to using WITH_SASL to indicate SASL support
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ec18f62f887f3cdc7bf796462c8fb614c45c4cd;p=thirdparty%2Ffreeradius-server.git

Switch to using WITH_SASL to indicate SASL support
---

diff --git a/src/lib/ldap/libfreeradius-ldap.h b/src/lib/ldap/libfreeradius-ldap.h
index 6f9192216a3..e004f66f83c 100644
--- a/src/lib/ldap/libfreeradius-ldap.h
+++ b/src/lib/ldap/libfreeradius-ldap.h
@@ -478,7 +478,7 @@ int		fr_ldap_map_do(REQUEST *request, fr_ldap_connection_t *conn,
 /*
  *	sasl_s.c - SASL synchronous bind functions
  */
-#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND
+#ifdef WITH_SASL
 fr_ldap_rcode_t	 fr_ldap_sasl_interactive(REQUEST *request,
 					  fr_ldap_connection_t *pconn, char const *dn,
 					  char const *password, fr_ldap_sasl_t const *sasl,
@@ -516,7 +516,7 @@ int		fr_ldap_start_tls_async(fr_ldap_connection_t *c,
 /*
  *	sasl.c - Async sasl bind
  */
-#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND
+#ifdef WITH_SASL
 int		fr_ldap_sasl_bind_async(fr_ldap_connection_t *c,
 					char const *mechs,
 			    		char const *identity,
diff --git a/src/lib/ldap/state.c b/src/lib/ldap/state.c
index 920d9130578..75fdfa64220 100644
--- a/src/lib/ldap/state.c
+++ b/src/lib/ldap/state.c
@@ -73,7 +73,7 @@ again:
 		/*
 		 *	SASL uses a different (and more complex) codepath
 		 */
-#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND
+#ifdef WITH_SASL
 		if (c->config->admin_sasl.mech) {
 			if (fr_ldap_sasl_bind_async(c,
 						    c->config->admin_sasl.mech,