From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 19 Feb 2005 12:25:55 +0000 (+0000)
Subject: honor abandon/cancel (ITS#3551)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~158
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5d19659193f118210889d49824dd7074a47809bd;p=openldap

honor abandon/cancel (ITS#3551)
---

diff --git a/servers/slapd/back-sql/back-sql.h b/servers/slapd/back-sql/back-sql.h
index 49af9ed694..d905d2bf23 100644
--- a/servers/slapd/back-sql/back-sql.h
+++ b/servers/slapd/back-sql/back-sql.h
@@ -444,7 +444,6 @@ typedef struct backsql_srch_info {
 				**bsi_id_listtail,
 				*bsi_c_eid;
 	int			bsi_n_candidates;
-	int			bsi_abandon;
 	int			bsi_status;
 
 	backsql_oc_map_rec	*bsi_oc;
diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index accaa533e7..da3cea0d21 100644
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -253,7 +253,6 @@ backsql_init_search(
 		}
 	}
 
-	bsi->bsi_abandon = 0;
 	bsi->bsi_id_list = NULL;
 	bsi->bsi_id_listtail = &bsi->bsi_id_list;
 	bsi->bsi_n_candidates = 0;
@@ -1464,6 +1463,12 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi )
 	Debug( LDAP_DEBUG_TRACE, "==>backsql_oc_get_candidates(): oc=\"%s\"\n",
 			BACKSQL_OC_NAME( oc ), 0, 0 );
 
+	/* check for abandon */
+	if ( op->o_abandon ) {
+		bsi->bsi_status = SLAPD_ABANDON;
+		return BACKSQL_AVL_STOP;
+	}
+
 	if ( bsi->bsi_n_candidates == -1 ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
 			"unchecked limit has been overcome\n", 0, 0, 0 );
@@ -1943,6 +1948,12 @@ backsql_search( Operation *op, SlapReply *rs )
 		 */
 		avl_apply( bi->sql_oc_by_oc, backsql_oc_get_candidates,
 				&bsi, BACKSQL_AVL_STOP, AVL_INORDER );
+
+		/* check for abandon */
+		if ( op->o_abandon ) {
+			rs->sr_err = SLAPD_ABANDON;
+			goto send_results;
+		}
 	}
 
 	if ( op->ors_limit != NULL	/* isroot == FALSE */
@@ -1973,7 +1984,8 @@ backsql_search( Operation *op, SlapReply *rs )
 
 		/* check for abandon */
 		if ( op->o_abandon ) {
-			break;
+			rs->sr_err = SLAPD_ABANDON;
+			goto send_results;
 		}
 
 		/* check time limit */
@@ -2229,7 +2241,9 @@ end_of_search:;
 	}
 
 send_results:;
-	send_ldap_result( op, rs );
+	if ( rs->sr_err != SLAPD_ABANDON ) {
+		send_ldap_result( op, rs );
+	}
 
 	entry_clean( &base_entry );
 
@@ -2282,7 +2296,8 @@ done:;
 	}
 
 	Debug( LDAP_DEBUG_TRACE, "<==backsql_search()\n", 0, 0, 0 );
-	return 0;
+
+	return rs->sr_err;
 }
 
 /* return LDAP_SUCCESS IFF we can retrieve the specified entry.