Cleanup result handling

[openldap] / servers / slapd / backglue.c

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 669f8525f1c92a219b32476b8bf7453e3a86bc11..d8c13e96906d9de82292bd860bb5a66079496866 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -315,7 +315,7 @@ glue_back_search ( Operation *op, SlapReply *rs )
                         * check for abandon 
                         */
                        if (op->o_abandon) {
-                               goto done;
+                               goto end_of_loop;
                        }
                        op->o_bd = gi->n[i].be;
 
@@ -365,14 +365,15 @@ end_of_loop:;
 
                break;
        }
-       op->o_callback = cb.sc_next;
-       rs->sr_err = gs.err;
-       rs->sr_matched = gs.matched;
-       rs->sr_ref = gs.refs;
+       if ( !op->o_abandon ) {
+               op->o_callback = cb.sc_next;
+               rs->sr_err = gs.err;
+               rs->sr_matched = gs.matched;
+               rs->sr_ref = gs.refs;
 
-       send_ldap_result( op, rs );
+               send_ldap_result( op, rs );
+       }
 
-done:
        op->o_bd = b0;
        if (gs.matched)
                free (gs.matched);