Cleanup result handling

[openldap] / servers / slapd / backglue.c

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index bd0a4338f23ec7a412c75ae73ca3d6a5b1f084f1..d8c13e96906d9de82292bd860bb5a66079496866 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -179,7 +179,6 @@ glue_back_db_destroy (
 
 typedef struct glue_state {
        int err;
-       int is_slimit;
        int slimit;
        int matchlen;
        char *matched;
@@ -194,8 +193,8 @@ glue_back_response ( Operation *op, SlapReply *rs )
 
        switch(rs->sr_type) {
        case REP_SEARCH:
-               if ( gs->is_slimit && rs->sr_nentries >= gs->slimit ) {
-                       gs->err = LDAP_SIZELIMIT_EXCEEDED;
+               if ( gs->slimit && rs->sr_nentries >= gs->slimit ) {
+                       rs->sr_err = gs->err = LDAP_SIZELIMIT_EXCEEDED;
                        return -1;
                }
                /* fallthru */
@@ -203,14 +202,12 @@ glue_back_response ( Operation *op, SlapReply *rs )
                return SLAP_CB_CONTINUE;
 
        default:
-               if ( gs->is_slimit && rs->sr_err == LDAP_SIZELIMIT_EXCEEDED
-                               && rs->sr_nentries >= gs->slimit ) {
-                       gs->err = LDAP_SIZELIMIT_EXCEEDED;
-                       return -1;
-               }
-               if (rs->sr_err == LDAP_SUCCESS || gs->err != LDAP_SUCCESS) {
+               if (rs->sr_err == LDAP_SUCCESS ||
+                       rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ||
+                       rs->sr_err == LDAP_TIMELIMIT_EXCEEDED ||
+                       rs->sr_err == LDAP_ADMINLIMIT_EXCEEDED ||
+                               gs->err != LDAP_SUCCESS)
                        gs->err = rs->sr_err;
-               }
                if (gs->err == LDAP_SUCCESS && gs->matched) {
                        ch_free (gs->matched);
                        gs->matched = NULL;
@@ -257,13 +254,11 @@ glue_back_search ( Operation *op, SlapReply *rs )
        glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
        long stoptime = 0;
-       glue_state gs = {0, 0, 0, 0, NULL, 0, NULL};
+       glue_state gs = {0, 0, 0, NULL, 0, NULL};
        slap_callback cb = { NULL, glue_back_response, NULL, NULL };
        int scope0, slimit0, tlimit0;
        struct berval dn, ndn;
 
-       gs.is_slimit = ( op->ors_slimit > 0 );
-
        cb.sc_private = &gs;
 
        cb.sc_next = op->o_callback;
@@ -290,9 +285,7 @@ glue_back_search ( Operation *op, SlapReply *rs )
                op->o_callback = &cb;
                rs->sr_err = gs.err = LDAP_UNWILLING_TO_PERFORM;
                scope0 = op->ors_scope;
-               if ( gs.is_slimit ) {
-                       slimit0 = gs.slimit = op->ors_slimit;
-               }
+               slimit0 = gs.slimit = op->ors_slimit;
                tlimit0 = op->ors_tlimit;
                dn = op->o_req_dn;
                ndn = op->o_req_ndn;
@@ -310,7 +303,7 @@ glue_back_search ( Operation *op, SlapReply *rs )
                                        break;
                                }
                        }
-                       if ( gs.is_slimit ) {
+                       if (slimit0) {
                                op->ors_slimit = slimit0 - rs->sr_nentries;
                                if (op->ors_slimit < 0) {
                                        rs->sr_err = gs.err = LDAP_SIZELIMIT_EXCEEDED;
@@ -322,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,23 +358,22 @@ glue_back_search ( Operation *op, SlapReply *rs )
                }
 end_of_loop:;
                op->ors_scope = scope0;
-               if ( gs.is_slimit ) {
-                       op->ors_slimit = slimit0;
-               }
+               op->ors_slimit = slimit0;
                op->ors_tlimit = tlimit0;
                op->o_req_dn = dn;
                op->o_req_ndn = ndn;
 
                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);
@@ -441,7 +433,8 @@ glue_tool_entry_first (
                }
 
        }
-       if (!glueBack || glueBack->be_entry_open (glueBack, glueMode) != 0)
+       if (!glueBack || !glueBack->be_entry_open || !glueBack->be_entry_first ||
+               glueBack->be_entry_open (glueBack, glueMode) != 0)
                return NOID;
 
        return glueBack->be_entry_first (glueBack);
@@ -462,15 +455,16 @@ glue_tool_entry_next (
        rc = glueBack->be_entry_next (glueBack);
 
        /* If we ran out of entries in one database, move on to the next */
-       if (rc == NOID) {
-               glueBack->be_entry_close (glueBack);
+       while (rc == NOID) {
+               if ( glueBack && glueBack->be_entry_close )
+                       glueBack->be_entry_close (glueBack);
                for (i=0; i<gi->nodes; i++) {
                        if (gi->n[i].be == glueBack)
                                break;
                }
                if (i == 0) {
                        glueBack = NULL;
-                       rc = NOID;
+                       break;
                } else {
                        glueBack = gi->n[i-1].be;
                        rc = glue_tool_entry_first (b0);