fix ITS#2999 (cleanup op structure after abandon)

diff --git a/CHANGES b/CHANGES
index 4265b588b8eb4551bde64346eaf3e29e2e6e7855..ea7e1329b7429e208e27405c13cb21c8cba81a10 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.2 Change Log
 
 OpenLDAP 2.2.7 Engineering
        Added total operation count in back-monitor (ITS#2983)
+       Fixed search abandon handling in backglue (ITS#2999)
 
 OpenLDAP 2.2.6 Release
        Fixed slapd SASL callback handling (ITS#2926)

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 21b12c6286fdc8a50b97e95d39787d5829a59266..b1e565493fe6c88f0f101df53bd9c722eed7e3fd 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -314,6 +314,8 @@ glue_back_search ( Operation *op, SlapReply *rs )
                         * check for abandon 
                         */
                        if (op->o_abandon) {
+                               op->o_req_dn = dn;
+                               op->o_req_ndn = ndn;
                                goto done;
                        }
                        op->o_bd = gi->n[i].be;