typedef struct glue_state {
int err;
- int is_slimit;
int slimit;
int matchlen;
char *matched;
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 */
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;
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;
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;
- 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;
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;
* check for abandon
*/
if (op->o_abandon) {
- goto done;
+ goto end_of_loop;
}
op->o_bd = gi->n[i].be;
}
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);
}
}
- 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);
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);
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;
}
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
* 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;