From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 25 Apr 2000 19:28:00 +0000 (+0000)
Subject: fix -UHAVE_CYRUS_SASL
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~3061
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b872bf3a918f5cc23468f5c28aecc6edc5c05fb8;p=openldap

fix -UHAVE_CYRUS_SASL
---

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 78f84fb904..826654f539 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -535,12 +535,11 @@ LIBSLAPD_F (char **) supportedSASLMechanisms;
 
 LIBSLAPD_F (int) sasl_init(void);
 LIBSLAPD_F (int) sasl_destroy(void);
-#ifdef HAVE_CYRUS_SASL
 LIBSLAPD_F (int) sasl_errldap LDAP_P(( int ));
 LIBSLAPD_F (int) sasl_bind LDAP_P((
 	Connection *, Operation *, 
 	char *, char *, char *, struct berval *, char **));
-#endif
+
 
 /* oc.c */
 LIBSLAPD_F (int) oc_schema_info( Entry *e );
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 1cb655ed16..677805fb17 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -244,6 +244,23 @@ int sasl_bind(
 
 #else
 /* no SASL support */
+int sasl_bind(
+    Connection          *conn,
+    Operation           *op,  
+    char                *dn,  
+    char                *ndn,
+    char                *mech,
+    struct berval       *cred,
+	char				**edn )
+{
+	int rc;
+
+	send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+		NULL, "SASL unavailable", NULL, NULL );
+
+	return rc;
+}
+
 int sasl_init( void ) { return 0; }
 int sasl_destroy( void ) { return 0; }
 #endif