upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 01:59:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix slapi_dn_beparent() logic

Browse source
This commit is contained in:
Luke Howard 2005-07-31 06:45:39 +00:00
parent 040a0956ac
commit f0101fe5a7
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
servers/slapd/slapi/slapi_utils.c
View file

@ -946,11 +946,15 @@ char *slapi_dn_beparent( Slapi_PBlock *pb, const char *_dn )
Backend *be;
struct berval dn, prettyDN;
struct berval normalizedDN, parentDN;
char *parent = NULL;
if ( pb == NULL || pb->pb_op == NULL )
if ( pb == NULL ) {
return NULL;
}
be = pb->pb_op->o_bd;
if ( slapi_is_rootdse( _dn ) ) {
return NULL;
}
dn.bv_val = (char *)_dn;
dn.bv_len = strlen( _dn );
@ -959,22 +963,19 @@ char *slapi_dn_beparent( Slapi_PBlock *pb, const char *_dn )
return NULL;
}
if ( be != NULL && be_issuffix( be, &normalizedDN ) ) {
slapi_ch_free( (void **)&prettyDN.bv_val );
slapi_ch_free( (void **)&normalizedDN.bv_val );
return NULL;
}
be = select_backend( &dn, 0, 0 );
dnParent( &prettyDN, &parentDN );
if ( be == NULL || be_issuffix( be, &normalizedDN ) == 0 ) {
dnParent( &prettyDN, &parentDN );
if ( parentDN.bv_len != 0 )
parent = slapi_ch_strdup( parentDN.bv_val );
}
slapi_ch_free( (void **)&prettyDN.bv_val );
slapi_ch_free( (void **)&normalizedDN.bv_val );
if ( parentDN.bv_len == 0 ) {
return NULL;
}
return slapi_ch_strdup( parentDN.bv_val );
return parent;
}
char *