Fix builds without LDAP_SASL_INTERACTIVE_BIND

diff --git a/src/lib/ldap/libfreeradius-ldap.h b/src/lib/ldap/libfreeradius-ldap.h
index 8e5f598346dd14e189c5b90db1d43987df6f4c4e..6f9192216a39dfa19527b4beac6195e758fbc1aa 100644 (file)
--- a/src/lib/ldap/libfreeradius-ldap.h
+++ b/src/lib/ldap/libfreeradius-ldap.h
@@ -478,11 +478,13 @@ 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
 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,
                                          LDAPControl **serverctrls, LDAPControl **clientctrls,
                                          struct timeval const *timeout);
+#endif
 
 /*
  *     connection.c - Connection configuration functions
@@ -514,6 +516,7 @@ int         fr_ldap_start_tls_async(fr_ldap_connection_t *c,
 /*
  *     sasl.c - Async sasl bind
  */
+#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND
 int            fr_ldap_sasl_bind_async(fr_ldap_connection_t *c,
                                        char const *mechs,
                                        char const *identity,
@@ -521,6 +524,8 @@ int         fr_ldap_sasl_bind_async(fr_ldap_connection_t *c,
                                        char const *proxy,
                                        char const *realm,
                                        LDAPControl **serverctrls, LDAPControl **clientctrls);
+#endif
+
 /*
  *     bind.c - Async bind
  */

diff --git a/src/lib/ldap/state.c b/src/lib/ldap/state.c
index b4247fc13119c0a641bfb650b60a02229e8c3fea..920d91305785bbb4af4f39e48ece05ee1b790607 100644 (file)
--- a/src/lib/ldap/state.c
+++ b/src/lib/ldap/state.c
@@ -73,6 +73,7 @@ again:
                /*
                 *      SASL uses a different (and more complex) codepath
                 */
+#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND
                if (c->config->admin_sasl.mech) {
                        if (fr_ldap_sasl_bind_async(c,
                                                    c->config->admin_sasl.mech,
@@ -86,6 +87,7 @@ again:
                        }
                        break;
                }
+#endif
 
                /*
                 *      Normal binds are just a simple request/response pair