X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=d5746e1da9a533614de68f079db0fd9e9bab9fdb;hb=59e9ff6243465640956b58ad1756a3ede53eca7c;hp=36c693e062e9ccddf7021902bb6716efd185a5ee;hpb=dc650034cf4b978706b24ccf539bbba4e988c931;p=openldap

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 36c693e062..d5746e1da9 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2015 The OpenLDAP Foundation.
+ * Copyright 1998-2018 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -245,6 +245,10 @@ do_search(
 
 	op->o_bd = frontendDB;
 	rs->sr_err = frontendDB->be_search( op, rs );
+	if ( rs->sr_err == SLAPD_ASYNCOP ) {
+		/* skip cleanup */
+		return rs->sr_err;
+	}
 
 return_results:;
 	if ( !BER_BVISNULL( &op->o_req_dn ) ) {