/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
* Portions Copyright 2004 Symas Corporation.
* All rights reserved.
*
{
slap_overinst *on = (slap_overinst *)be->bd_info;
refint_data *id = ch_malloc(sizeof(refint_data));
- refint_attrs *ip;
+
id->message = "_init";
id->attrs = NULL;
id->newdn.bv_val = NULL;
{
Attribute *a;
BerVarray b = NULL;
- refint_data *id, *dd = op->o_callback->sc_private;
+ refint_data *dd = op->o_callback->sc_private;
refint_attrs *ia, *da = dd->attrs;
- dependent_data *ip, *dp = NULL;
+ dependent_data *ip;
Modifications *mp, *ma;
int i;
ip->mm = NULL;
ma = NULL;
for(ia = da; ia; ia = ia->next) {
- if(a = attr_find(rs->sr_entry->e_attrs, ia->attr))
+ if ( (a = attr_find(rs->sr_entry->e_attrs, ia->attr) ) )
for(i = 0, b = a->a_nvals; b[i].bv_val; i++)
if(bvmatch(&dd->dn, &b[i])) {
if(!ip->dn.bv_val) ber_dupbv(&ip->dn, &rs->sr_entry->e_nname);
{
Attribute *a;
BerVarray b = NULL;
- refint_data *id, *dd = op->o_callback->sc_private;
+ refint_data *dd = op->o_callback->sc_private;
refint_attrs *ia, *da = dd->attrs;
- dependent_data *ip = NULL, *dp = NULL;
+ dependent_data *ip = NULL;
Modifications *mp;
- int i, j, fix;
+ int i, fix;
Debug(LDAP_DEBUG_TRACE, "refint_modrdn_cb <%s>\n",
rs->sr_entry ? rs->sr_entry->e_name.bv_val : "NOTHING", 0, 0);
*/
for(ia = da; ia; ia = ia->next) {
- if(a = attr_find(rs->sr_entry->e_attrs, ia->attr)) {
+ if((a = attr_find(rs->sr_entry->e_attrs, ia->attr))) {
for(fix = 0, i = 0, b = a->a_nvals; b[i].bv_val; i++)
if(bvmatch(&dd->dn, &b[i])) { fix++; break; }
if(fix) {
refint_data dd = *id;
refint_attrs *ip;
dependent_data *dp;
- char *fstr, *key, *kp, **dnpp, **ndnpp, *cp;
- BerValue ndn, moddn, pdn;
- BerVarray b = NULL;
- int rc, ac, i, j, ksize;
+ BerValue pdn;
+ int rc, ac;
+ Filter ftop, *fptr;
id->message = "_refint_response";
}
/*
- ** calculate the search key size and allocate it;
** build a search filter for all configured attributes;
** populate our Operation;
** pass our data (attr list, dn) to backend via sc_private;
**
*/
- for(ksize = 16, ip = id->attrs; ip; ip = ip->next)
- ksize += ip->attr->ad_cname.bv_len + op->o_req_dn.bv_len + 3;
- kp = key = ch_malloc(ksize);
- if(--ac) kp += sprintf(key, "(|");
- for(ip = id->attrs; ip; ip = ip->next)
- kp += sprintf(kp, "(%s=%s)",
- ip->attr->ad_cname.bv_val, op->o_req_dn.bv_val);
- if(ac) *kp++ = ')';
- *kp = 0;
-
- nop.ors_filter = str2filter_x(&nop, key);
- ber_str2bv(key, 0, 0, &nop.ors_filterstr);
+ ftop.f_choice = LDAP_FILTER_OR;
+ ftop.f_next = NULL;
+ ftop.f_or = NULL;
+ nop.ors_filter = &ftop;
+ for(ip = id->attrs; ip; ip = ip->next) {
+ fptr = ch_malloc( sizeof(Filter) + sizeof(AttributeAssertion) );
+ fptr->f_choice = LDAP_FILTER_EQUALITY;
+ fptr->f_ava = (AttributeAssertion *)(fptr+1);
+ fptr->f_ava->aa_desc = ip->attr;
+ fptr->f_ava->aa_value = op->o_req_ndn;
+ fptr->f_next = ftop.f_or;
+ ftop.f_or = fptr;
+ }
+ filter2bv( nop.ors_filter, &nop.ors_filterstr );
/* callback gets the searched dn instead */
dd.dn = op->o_req_ndn;
nop.o_tag = LDAP_REQ_SEARCH;
nop.ors_scope = LDAP_SCOPE_SUBTREE;
nop.ors_deref = LDAP_DEREF_NEVER;
- nop.ors_slimit = -1;
- nop.ors_tlimit = -1;
+ nop.ors_limit = NULL;
+ nop.ors_slimit = SLAP_NO_LIMIT;
+ nop.ors_tlimit = SLAP_NO_LIMIT;
+
+ /* no attrs! */
+ nop.ors_attrs = slap_anlist_no_attrs;
+ nop.ors_attrsonly = 1;
+
nop.o_req_ndn = id->dn;
nop.o_req_dn = id->dn;
/* search */
rc = nop.o_bd->be_search(&nop, &nrs);
- filter_free_x(&nop, nop.ors_filter);
- ch_free(key);
+ ch_free( nop.ors_filterstr.bv_val );
+ while ( fptr = ftop.f_or ) {
+ ftop.f_or = fptr->f_next;
+ ch_free( fptr );
+ }
ch_free(dd.nnewdn.bv_val);
ch_free(dd.newdn.bv_val);
dd.newdn.bv_val = NULL;
dd.message = "_dependent_modify";
/* See if the parent operation is going into the replog */
- cbo = NULL;
- for (cbp = op->o_callback->sc_next; cbp; cbo=cbp,cbp=cbp->sc_next) {
+ for (cbo=op->o_callback, cbp = cbo->sc_next; cbp; cbo=cbp,cbp=cbp->sc_next) {
if (cbp->sc_response == slap_replog_cb) {
/* Invoke replog now, arrange for our
* dependent mods to also be logged
nop.o_dn = refint_dn;
nop.o_ndn = refint_dn;
rs->sr_err = slap_mods_opattrs( &nop, nop.orm_modlist,
- tail, &rs->sr_text, NULL, 0 );
+ tail, &rs->sr_text, NULL, 0, 1 );
nop.o_dn = nop.o_bd->be_rootdn;
nop.o_ndn = nop.o_bd->be_rootndn;
if(rs->sr_err != LDAP_SUCCESS) goto done;
projects / openldap / blobdiff