From 175ace59c8906d27639d5ee72cfaa3e4de2b2c02 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 2 Jul 1999 00:46:28 +0000
Subject: [PATCH] Send LDAP_SASL_BIND_IN_PROGRESS if o_bind_in_progress is
 true.

---
 servers/slapd/add.c     | 7 +++++++
 servers/slapd/compare.c | 8 ++++++++
 servers/slapd/delete.c  | 8 ++++++++
 servers/slapd/modify.c  | 8 ++++++++
 servers/slapd/modrdn.c  | 8 ++++++++
 servers/slapd/search.c  | 8 ++++++++
 6 files changed, 47 insertions(+)

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 1c897d91f8..b1db141b59 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -35,6 +35,13 @@ do_add( Connection *conn, Operation *op )
 
 	Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
 
+	if( op->o_bind_in_progress ) {
+		Debug( LDAP_DEBUG_ANY, "do_add: SASL bind in progress.\n", 0, 0, 0 );
+		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
+		    "SASL bind in progress" );
+		return LDAP_SASL_BIND_IN_PROGRESS;
+	}
+
 	/*
 	 * Parse the add request.  It looks like this:
 	 *
diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 6519084aa1..544b7ca1cd 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -31,6 +31,14 @@ do_compare(
 
 	Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
 
+	if( op->o_bind_in_progress ) {
+		Debug( LDAP_DEBUG_ANY, "do_compare: SASL bind in progress.\n",
+			0, 0, 0 );
+		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
+		    "SASL bind in progress" );
+		return LDAP_SASL_BIND_IN_PROGRESS;
+	}
+
 	/*
 	 * Parse the compare request.  It looks like this:
 	 *
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 13c099b597..06253200a5 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -31,6 +31,14 @@ do_delete(
 
 	Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 );
 
+	if( op->o_bind_in_progress ) {
+		Debug( LDAP_DEBUG_ANY, "do_delete: SASL bind in progress.\n",
+			0, 0, 0 );
+		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
+		    "SASL bind in progress" );
+		return LDAP_SASL_BIND_IN_PROGRESS;
+	}
+
 	/*
 	 * Parse the delete request.  It looks like this:
 	 *
diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 2d412d0b1f..c245a54c62 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -42,6 +42,14 @@ do_modify(
 
 	Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
 
+	if( op->o_bind_in_progress ) {
+		Debug( LDAP_DEBUG_ANY, "do_modify: SASL bind in progress.\n",
+			0, 0, 0 );
+		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
+		    "SASL bind in progress" );
+		return LDAP_SASL_BIND_IN_PROGRESS;
+	}
+
 	/*
 	 * Parse the modify request.  It looks like this:
 	 *
diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 329190f930..d3f04f8ff5 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -50,6 +50,14 @@ do_modrdn(
 
 	Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 );
 
+	if( op->o_bind_in_progress ) {
+		Debug( LDAP_DEBUG_ANY, "do_modrdn: SASL bind in progress.\n",
+			0, 0, 0 );
+		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
+		    "SASL bind in progress" );
+		return LDAP_SASL_BIND_IN_PROGRESS;
+	}
+
 	/*
 	 * Parse the modrdn request.  It looks like this:
 	 *
diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 920685e58a..25f7316379 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -38,6 +38,14 @@ do_search(
 
 	Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 );
 
+	if( op->o_bind_in_progress ) {
+		Debug( LDAP_DEBUG_ANY, "do_search: SASL bind in progress.\n",
+			0, 0, 0 );
+		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
+		    "SASL bind in progress" );
+		return LDAP_SASL_BIND_IN_PROGRESS;
+	}
+
 	/*
 	 * Parse the search request.  It looks like this:
 	 *
-- 
2.39.5