Add send_ldap_sasl() to facility implementation of SASL bind.

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 8cd5406c1bd15c67c98a36f73dfa913653bb8270..7064a4da49d6b335043287460622aeac65b444c9 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -330,6 +330,12 @@ LIBSLAPD_F (void) send_ldap_result LDAP_P((
        struct berval **refs,
        LDAPControl **ctrls ));
 
+LIBSLAPD_F (void) send_ldap_sasl LDAP_P((
+       Connection *conn, Operation *op,
+       ber_int_t err, const char *matched,
+       const char *text,
+       struct berval *cred ));
+
 LIBSLAPD_F (void) send_ldap_disconnect LDAP_P((
        Connection *conn, Operation *op,
        ber_int_t err, const char *text ));
@@ -337,8 +343,8 @@ LIBSLAPD_F (void) send_ldap_disconnect LDAP_P((
 LIBSLAPD_F (void) send_ldap_extended LDAP_P((
        Connection *conn, Operation *op,
        ber_int_t err, const char *matched,
-       const char *text, char *rspoid,
-       struct berval *rspdata ));
+       const char *text,
+       char *rspoid, struct berval *rspdata ));
 
 LIBSLAPD_F (void) send_search_result LDAP_P((
        Connection *conn, Operation *op,

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index c7f6892dfd7d24b99b013c194abb99b7ac613a5e..510102a7c02f26fedf5e7fa9357fdb41f983353d 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -440,6 +440,41 @@ send_ldap_result(
        }
 }
 
+void
+send_ldap_sasl(
+    Connection *conn,
+    Operation  *op,
+    ber_int_t  err,
+    const char *matched,
+    const char *text,
+       struct berval *cred
+)
+{
+       ber_tag_t tag;
+       ber_int_t msgid;
+
+       Debug( LDAP_DEBUG_TRACE, "send_ldap_sasl %ld\n",
+               (long) err, NULL, NULL );
+
+       tag = req2res( op->o_tag );
+       msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
+
+#ifdef LDAP_CONNECTIONLESS
+       if ( op->o_cldap ) {
+               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+               Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
+                   inet_ntoa(((struct sockaddr_in *)
+                   &op->o_clientaddr)->sin_addr ),
+                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
+                   0 );
+       }
+#endif
+
+       send_ldap_response( conn, op, tag, msgid,
+               err, matched, text, NULL,
+               NULL, cred, NULL );
+}
+
 void
 send_ldap_extended(
     Connection *conn,
@@ -455,8 +490,8 @@ send_ldap_extended(
        ber_int_t msgid;
 
        Debug( LDAP_DEBUG_TRACE,
-               "send_ldap_extended %d:%s\n",
-               err, rspoid ? rspoid : "", NULL );
+               "send_ldap_extended %ld:%s\n",
+               (long) err, rspoid ? rspoid : "", NULL );
 
        tag = req2res( op->o_tag );
        msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;

diff --git a/servers/slapd/tools/mimic.c b/servers/slapd/tools/mimic.c
index 55d35c6090c02f89f2e68d36eb49de73333fac86..caea1a513558f0078172f65716d901a8304cb288 100644 (file)
--- a/servers/slapd/tools/mimic.c
+++ b/servers/slapd/tools/mimic.c
@@ -39,6 +39,33 @@ send_ldap_disconnect(
        assert(0);
 }
 
+void
+send_ldap_extended(
+    Connection *conn,
+    Operation  *op,
+    ber_int_t  err,
+    const char *matched,
+    const char *text,
+    char       *rspoid,
+       struct berval *rspdata
+)
+{
+       assert(0);
+}
+
+void
+send_ldap_sasl(
+    Connection *conn,
+    Operation  *op,
+    ber_int_t  err,
+    const char *matched,
+    const char *text,
+       struct berval *cred
+)
+{
+       assert(0);
+}
+
 void
 send_ldap_result(
        Connection  *conn,