typedef struct gluenode {
BackendDB *be;
- char *pdn;
+ struct berval pdn;
} gluenode;
typedef struct glueinfo {
int matchlen;
char *matched;
int nrefs;
- BVarray refs;
+ BerVarray refs;
slap_callback *prevcb;
} glue_state;
ber_int_t err,
const char *matched,
const char *text,
- BVarray ref,
+ BerVarray ref,
const char *resoid,
struct berval *resdata,
struct berval *sasldata,
}
if (ref) {
int i, j, k;
- BVarray new;
+ BerVarray new;
for (i=0; ref[i].bv_val; i++);
ber_int_t err,
const char *matched,
const char *text,
- BVarray refs,
+ BerVarray refs,
LDAPControl **ctrls,
int nentries
)
}
be = gi->n[i].be;
if (scope == LDAP_SCOPE_ONELEVEL &&
- !strcmp (gi->n[i].pdn, ndn->bv_val)) {
+ dn_match(&gi->n[i].pdn, ndn)) {
rc = be->be_search (be, conn, op,
be->be_suffix[0], be->be_nsuffix[0],
LDAP_SCOPE_BASE, deref,
if (gs.matched)
free (gs.matched);
if (gs.refs)
- bvarray_free(gs.refs);
+ ber_bvarray_free(gs.refs);
return rc;
}
Entry *target,
struct berval *ndn,
AttributeDescription *ad,
- BVarray *vals
+ BerVarray *vals
)
{
BackendDB *be;
gi->nodes * sizeof(gluenode));
}
gi->n[gi->nodes].be = be;
- gi->n[gi->nodes].pdn = dn_parent(NULL,
- be->be_nsuffix[0]->bv_val);
+ dnParent( be->be_nsuffix[0], &gi->n[gi->nodes].pdn );
gi->nodes++;
}
if (gi) {
gi = (glueinfo *)ch_realloc(gi,
sizeof(glueinfo) + gi->nodes * sizeof(gluenode));
gi->n[gi->nodes].be = gi->be;
- gi->n[gi->nodes].pdn = dn_parent(NULL,
- b1->be_nsuffix[0]->bv_val);
+ dnParent( b1->be_nsuffix[0], &gi->n[gi->nodes].pdn );
gi->nodes++;
b1->be_private = gi;
b1->bd_info = bi;