/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
typedef struct glue_state {
+ char *matched;
+ BerVarray refs;
+ LDAPControl **ctrls;
int err;
- int slimit;
int matchlen;
- char *matched;
int nrefs;
- BerVarray refs;
+ int nctrls;
} glue_state;
static int
switch(rs->sr_type) {
case REP_SEARCH:
- if ( gs->slimit != SLAP_NO_LIMIT
- && rs->sr_nentries >= gs->slimit )
- {
- rs->sr_err = gs->err = LDAP_SIZELIMIT_EXCEEDED;
- return -1;
- }
- /* fallthru */
case REP_SEARCHREF:
+ case REP_INTERMEDIATE:
return SLAP_CB_CONTINUE;
default:
gs->nrefs = j;
gs->refs = new;
}
+ if (rs->sr_ctrls) {
+ int i, j, k;
+ LDAPControl **newctrls;
+
+ for (i=0; rs->sr_ctrls[i]; i++);
+
+ j = gs->nctrls;
+ if (!j) {
+ newctrls = ch_malloc((i+1)*sizeof(LDAPControl *));
+ } else {
+ newctrls = ch_realloc(gs->ctrls,
+ (j+i+1)*sizeof(LDAPControl *));
+ }
+ for (k=0; k<i; j++,k++) {
+ newctrls[j] = ch_malloc(sizeof(LDAPControl));
+ *newctrls[j] = *rs->sr_ctrls[k];
+ if ( !BER_BVISNULL( &rs->sr_ctrls[k]->ldctl_value ))
+ ber_dupbv( &newctrls[j]->ldctl_value,
+ &rs->sr_ctrls[k]->ldctl_value );
+ }
+ newctrls[j] = NULL;
+ gs->nctrls = j;
+ gs->ctrls = newctrls;
+ }
}
return 0;
}
BackendDB *b0 = op->o_bd;
BackendInfo *bi0 = op->o_bd->bd_info;
BI_op_modify **func;
- slap_operation_t which;
+ slap_operation_t which = op_bind;
int rc;
op->o_bd = glue_back_select (b0, &op->o_req_ndn);
+
+ /* If we're on the master backend, let overlay framework handle it */
+ if ( op->o_bd == b0 )
+ return SLAP_CB_CONTINUE;
+
b0->bd_info = on->on_info->oi_orig;
switch(op->o_tag) {
case LDAP_REQ_DELETE: which = op_delete; break;
case LDAP_REQ_MODIFY: which = op_modify; break;
case LDAP_REQ_MODRDN: which = op_modrdn; break;
+ default: assert( 0 ); break;
}
func = &op->o_bd->bd_info->bi_op_bind;
int rc;
op->o_bd = glue_back_select (b0, &op->o_req_ndn);
+ if ( op->o_bd == b0 )
+ return SLAP_CB_CONTINUE;
+
b0->bd_info = on->on_info->oi_orig;
if ( op->o_bd->bd_info->bi_chk_referrals )
int rc = SLAP_CB_CONTINUE;
op->o_bd = glue_back_select (b0, &op->o_req_ndn);
+ if ( op->o_bd == b0 )
+ return SLAP_CB_CONTINUE;
+
b0->bd_info = on->on_info->oi_orig;
/* if the subordinate database has overlays, the bi_chk_controls()
return rc;
}
+static int
+glue_sub_search( Operation *op, SlapReply *rs, BackendDB *b0,
+ slap_overinst *on )
+{
+ /* Process any overlays on the master backend */
+ if ( op->o_bd == b0 && on->on_next ) {
+ BackendInfo *bi = op->o_bd->bd_info;
+ int rc = SLAP_CB_CONTINUE;
+ for ( on=on->on_next; on; on=on->on_next ) {
+ op->o_bd->bd_info = (BackendInfo *)on;
+ if ( on->on_bi.bi_op_search ) {
+ rc = on->on_bi.bi_op_search( op, rs );
+ if ( rc != SLAP_CB_CONTINUE )
+ break;
+ }
+ }
+ op->o_bd->bd_info = bi;
+ if ( rc != SLAP_CB_CONTINUE )
+ return rc;
+ }
+ return op->o_bd->be_search( op, rs );
+}
+
static int
glue_op_search ( Operation *op, SlapReply *rs )
{
BackendInfo *bi0 = op->o_bd->bd_info;
int i;
long stoptime = 0;
- glue_state gs = {0, 0, 0, NULL, 0, NULL};
+ glue_state gs = {NULL, NULL, NULL, 0, 0, 0, 0};
slap_callback cb = { NULL, glue_op_response, NULL, NULL };
- int scope0, slimit0, tlimit0;
+ int scope0, tlimit0;
struct berval dn, ndn, *pdn;
cb.sc_private = &gs;
switch (op->ors_scope) {
case LDAP_SCOPE_BASE:
+ if ( op->o_bd == b0 )
+ return SLAP_CB_CONTINUE;
+
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
if (op->o_bd && op->o_bd->be_search) {
rs->sr_err = op->o_bd->be_search( op, rs );
case LDAP_SCOPE_ONELEVEL:
case LDAP_SCOPE_SUBTREE:
-#ifdef LDAP_SCOPE_SUBORDINATE
case LDAP_SCOPE_SUBORDINATE: /* FIXME */
-#endif
-
-#if 0
- if ( op->o_sync ) {
- if (op->o_bd && op->o_bd->be_search) {
- rs->sr_err = op->o_bd->be_search( op, rs );
- } else {
- send_ldap_error(op, rs, LDAP_UNWILLING_TO_PERFORM,
- "No search target found");
- }
- return rs->sr_err;
- }
-#endif
-
op->o_callback = &cb;
rs->sr_err = gs.err = LDAP_UNWILLING_TO_PERFORM;
scope0 = op->ors_scope;
- slimit0 = gs.slimit = op->ors_slimit;
tlimit0 = op->ors_tlimit;
dn = op->o_req_dn;
ndn = op->o_req_ndn;
break;
}
}
- if (slimit0 != SLAP_NO_LIMIT) {
- op->ors_slimit = slimit0 - rs->sr_nentries;
- if (op->ors_slimit < 0) {
- rs->sr_err = gs.err = LDAP_SIZELIMIT_EXCEEDED;
- break;
- }
- }
rs->sr_err = 0;
/*
* check for abandon
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);
+ if ( rs->sr_err == LDAP_NO_SUCH_OBJECT ) {
+ gs.err = LDAP_SUCCESS;
+ }
} else if (scope0 == LDAP_SCOPE_SUBTREE &&
dn_match(&op->o_bd->be_nsuffix[0], &ndn))
{
- rs->sr_err = op->o_bd->be_search( op, rs );
+ rs->sr_err = glue_sub_search( op, rs, b0, on );
} else if (scope0 == LDAP_SCOPE_SUBTREE &&
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 );
+ rs->sr_err = glue_sub_search( op, rs, b0, on );
if ( rs->sr_err == LDAP_NO_SUCH_OBJECT ) {
gs.err = LDAP_SUCCESS;
}
+ op->o_req_dn = dn;
+ op->o_req_ndn = ndn;
} else if (dnIsSuffix(&ndn, &op->o_bd->be_nsuffix[0])) {
- rs->sr_err = op->o_bd->be_search( op, rs );
+ rs->sr_err = glue_sub_search( op, rs, b0, on );
}
switch ( gs.err ) {
case LDAP_ADMINLIMIT_EXCEEDED:
case LDAP_NO_SUCH_OBJECT:
#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
- case LDAP_CANNOT_CHAIN:
+ case LDAP_X_CANNOT_CHAIN:
#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
goto end_of_loop;
}
end_of_loop:;
op->ors_scope = scope0;
- op->ors_slimit = slimit0;
op->ors_tlimit = tlimit0;
op->o_req_dn = dn;
op->o_req_ndn = ndn;
rs->sr_err = gs.err;
rs->sr_matched = gs.matched;
rs->sr_ref = gs.refs;
+ rs->sr_ctrls = gs.ctrls;
send_ldap_result( op, rs );
}
free (gs.matched);
if (gs.refs)
ber_bvarray_free(gs.refs);
+ if (gs.ctrls) {
+ for (i = gs.nctrls; --i >= 0; ) {
+ if (!BER_BVISNULL( &gs.ctrls[i]->ldctl_value ))
+ free(gs.ctrls[i]->ldctl_value.bv_val);
+ free(gs.ctrls[i]);
+ }
+ free(gs.ctrls);
+ }
return rs->sr_err;
}
{
slap_overinst *on = (slap_overinst *)be->bd_info;
- on->on_info->oi_bi.bi_db_close = NULL;
+ on->on_info->oi_bi.bi_db_close = 0;
return 0;
}
int
glue_sub_init()
{
- int rc;
-
glue.on_bi.bi_type = "glue";
glue.on_bi.bi_db_init = glue_db_init;
projects / openldap / blobdiff