Changed dnParent to struct bervals

This commit is contained in:
Howard Chu 2002-01-26 06:52:24 +00:00
parent b907603b2d
commit 7e43108c31

View File

@ -806,7 +806,6 @@ glue_sub_init( )
BackendDB *b1, *be; BackendDB *b1, *be;
BackendInfo *bi; BackendInfo *bi;
glueinfo *gi; glueinfo *gi;
struct berval bv;
/* While there are subordinate backends, search backwards through the /* While there are subordinate backends, search backwards through the
* backends and connect them to their superior. * backends and connect them to their superior.
@ -885,14 +884,10 @@ glue_sub_init( )
gi->nodes * sizeof(gluenode)); gi->nodes * sizeof(gluenode));
} }
gi->n[gi->nodes].be = be; gi->n[gi->nodes].be = be;
if ( dnParent( be->be_nsuffix[0]->bv_val, if ( dnParent( be->be_nsuffix[0], &gi->n[gi->nodes].pdn )
(const char **)&bv.bv_val )
!= LDAP_SUCCESS ) { != LDAP_SUCCESS ) {
return -1; return -1;
} }
bv.bv_len = be->be_nsuffix[0]->bv_len - (bv.bv_val -
be->be_nsuffix[0]->bv_val);
gi->n[gi->nodes].pdn = bv;
gi->nodes++; gi->nodes++;
} }
if (gi) { if (gi) {
@ -900,14 +895,10 @@ glue_sub_init( )
gi = (glueinfo *)ch_realloc(gi, gi = (glueinfo *)ch_realloc(gi,
sizeof(glueinfo) + gi->nodes * sizeof(gluenode)); sizeof(glueinfo) + gi->nodes * sizeof(gluenode));
gi->n[gi->nodes].be = gi->be; gi->n[gi->nodes].be = gi->be;
if ( dnParent( b1->be_nsuffix[0]->bv_val, if ( dnParent( b1->be_nsuffix[0], &gi->n[gi->nodes].pdn )
(const char **)&bv.bv_val )
!= LDAP_SUCCESS ) { != LDAP_SUCCESS ) {
return -1; return -1;
} }
bv.bv_len = b1->be_nsuffix[0]->bv_len - (bv.bv_val -
b1->be_nsuffix[0]->bv_val);
gi->n[gi->nodes].pdn = bv;
gi->nodes++; gi->nodes++;
b1->be_private = gi; b1->be_private = gi;
b1->bd_info = bi; b1->bd_info = bi;