document search disable feature (spin-off of limit on unchecked entries)

[openldap] / servers / slapd / backglue.c

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index be2b7e93d1167615af11bd4ae922272ac4e190ce..cd8a63d3546201cd0e65a3230777f0bcfbfab6a4 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2003 The OpenLDAP Foundation.
+ * Copyright 2001-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,8 @@ glue_back_select (
        bv.bv_val = (char *) dn;
 
        for (i = 0; i<gi->nodes; i++) {
+               assert( gi->n[i].be->be_nsuffix );
+
                if (dnIsSuffix(&bv, &gi->n[i].be->be_nsuffix[0])) {
                        return gi->n[i].be;
                }
@@ -177,6 +179,7 @@ glue_back_db_destroy (
 
 typedef struct glue_state {
        int err;
+       int slimit;
        int matchlen;
        char *matched;
        int nrefs;
@@ -190,11 +193,20 @@ glue_back_response ( Operation *op, SlapReply *rs )
 
        switch(rs->sr_type) {
        case REP_SEARCH:
+               if ( gs->slimit && rs->sr_nentries >= gs->slimit ) {
+                       rs->sr_err = gs->err = LDAP_SIZELIMIT_EXCEEDED;
+                       return -1;
+               }
+               /* fallthru */
        case REP_SEARCHREF:
                return SLAP_CB_CONTINUE;
 
        default:
-               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);
@@ -242,7 +254,7 @@ glue_back_search ( Operation *op, SlapReply *rs )
        glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
        long stoptime = 0;
-       glue_state gs = {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;
@@ -269,10 +281,13 @@ glue_back_search ( Operation *op, SlapReply *rs )
 
        case LDAP_SCOPE_ONELEVEL:
        case LDAP_SCOPE_SUBTREE:
+#ifdef LDAP_SCOPE_SUBORDINATE
+       case LDAP_SCOPE_SUBORDINATE: /* FIXME */
+#endif
                op->o_callback = &cb;
                rs->sr_err = gs.err = LDAP_UNWILLING_TO_PERFORM;
                scope0 = op->ors_scope;
-               slimit0 = op->ors_slimit;
+               slimit0 = gs.slimit = op->ors_slimit;
                tlimit0 = op->ors_tlimit;
                dn = op->o_req_dn;
                ndn = op->o_req_ndn;
@@ -292,7 +307,7 @@ glue_back_search ( Operation *op, SlapReply *rs )
                        }
                        if (slimit0) {
                                op->ors_slimit = slimit0 - rs->sr_nentries;
-                               if (op->ors_slimit <= 0) {
+                               if (op->ors_slimit < 0) {
                                        rs->sr_err = gs.err = LDAP_SIZELIMIT_EXCEEDED;
                                        break;
                                }
@@ -302,18 +317,24 @@ 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;
+
+                       assert( op->o_bd->be_suffix );
+                       assert( op->o_bd->be_nsuffix );
+                       
                        if (scope0 == LDAP_SCOPE_ONELEVEL && 
-                               dn_match(&gi->n[i].pdn, &ndn)) {
+                               dn_match(&gi->n[i].pdn, &ndn))
+                       {
                                op->ors_scope = LDAP_SCOPE_BASE;
                                op->o_req_dn = op->o_bd->be_suffix[0];
                                op->o_req_ndn = op->o_bd->be_nsuffix[0];
                                rs->sr_err = op->o_bd->be_search(op, rs);
 
                        } else if (scope0 == LDAP_SCOPE_SUBTREE &&
-                               dnIsSuffix(&op->o_bd->be_nsuffix[0], &ndn)) {
+                               dnIsSuffix(&op->o_bd->be_nsuffix[0], &ndn))
+                       {
                                op->o_req_dn = op->o_bd->be_suffix[0];
                                op->o_req_ndn = op->o_bd->be_nsuffix[0];
                                rs->sr_err = op->o_bd->be_search( op, rs );
@@ -346,14 +367,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);
@@ -413,7 +435,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);
@@ -434,15 +457,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);
@@ -538,7 +562,7 @@ glue_sub_init( )
                if (SLAP_GLUE_SUBORDINATE ( b1 ) ) {
                        /* The last database cannot be a subordinate of noone */
                        if (i == nBackendDB - 1) {
-                               b1->be_flags ^= SLAP_BFLAG_GLUE_SUBORDINATE;
+                               SLAP_DBFLAGS(b1) ^= SLAP_DBFLAG_GLUE_SUBORDINATE;
                        }
                        continue;
                }
@@ -551,11 +575,13 @@ glue_sub_init( )
                        if ( SLAP_GLUE_LINKED( be ) ) {
                                continue;
                        }
+                       assert( be->be_nsuffix );
+                       assert( b1->be_nsuffix );
                        if (!dnIsSuffix(&be->be_nsuffix[0], &b1->be_nsuffix[0])) {
                                continue;
                        }
                        cont--;
-                       be->be_flags |= SLAP_BFLAG_GLUE_LINKED;
+                       SLAP_DBFLAGS(be) |= SLAP_DBFLAG_GLUE_LINKED;
                        if (gi == NULL) {
                                /* We create a copy of the superior's be
                                 * structure, pointing to all of its original
@@ -564,7 +590,7 @@ glue_sub_init( )
                                 * is used whenever we have operations to pass
                                 * down to the real database.
                                 */
-                               b1->be_flags |= SLAP_BFLAG_GLUE_INSTANCE;
+                               SLAP_DBFLAGS(b1) |= SLAP_DBFLAG_GLUE_INSTANCE;
                                gi = (glueinfo *)ch_malloc(sizeof(glueinfo));
                                gi->nodes = 0;
                                gi->bd = *b1;