From: Howard Chu <hyc@openldap.org>
Date: Fri, 10 Dec 2004 01:35:34 +0000 (+0000)
Subject: Fix abandon, only drop our cloned ops, not real frontend ops
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~67
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=480394acef70e7abc816d28c201f0d0e05ef4874;p=openldap

Fix abandon, only drop our cloned ops, not real frontend ops
---

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 4b7e61a889..98cfe6554f 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -882,7 +882,12 @@ syncprov_op_abandon( Operation *op, SlapReply *rs )
 			rs->sr_err = LDAP_CANCELLED;
 			send_ldap_result( so->s_op, rs );
 		}
-		syncprov_drop_psearch( so, 0 );
+		/* Our cloned searches have no ctrls set.
+		 * we don't want to muck with real search ops
+		 * from the frontend.
+		 */
+		if ( ! so->s_op->o_sync )
+			syncprov_drop_psearch( so, 0 );
 	}
 	return SLAP_CB_CONTINUE;
 }