mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

always pass a DN to the underlying database (ITS#6070)

Browse Source
This commit is contained in:
Pierangelo Masarati 2009-04-20 09:54:31 +00:00
parent f11fcf47d2
commit 5207531d9b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servers/slapd/overlays/rwm.c
View File

@ -847,6 +847,7 @@ rwm_entry_get_rw( Operation *op, struct berval *ndn,
SlapReply rs = { REP_SEARCH }; SlapReply rs = { REP_SEARCH };
rwm_op_state ros = { 0 }; rwm_op_state ros = { 0 };
struct berval mndn = BER_BVNULL;
if ( ((BackendInfo *)on->on_info->oi_orig)->bi_entry_get_rw == NULL ) { if ( ((BackendInfo *)on->on_info->oi_orig)->bi_entry_get_rw == NULL ) {
return SLAP_CB_CONTINUE; return SLAP_CB_CONTINUE;
@ -862,6 +863,8 @@ rwm_entry_get_rw( Operation *op, struct berval *ndn,
return LDAP_OTHER; return LDAP_OTHER;
} }
mndn = BER_BVISNULL( &ros.r_ndn ) ? *ndn : ros.r_ndn;
/* map attribute & objectClass */ /* map attribute & objectClass */
if ( at != NULL ) { if ( at != NULL ) {
} }
@ -874,7 +877,7 @@ rwm_entry_get_rw( Operation *op, struct berval *ndn,
op2.o_bd = &db; op2.o_bd = &db;
op2.o_bd->bd_info = (BackendInfo *)on->on_info->oi_orig; op2.o_bd->bd_info = (BackendInfo *)on->on_info->oi_orig;
op2.ors_attrs = slap_anlist_all_attributes; op2.ors_attrs = slap_anlist_all_attributes;
rc = op2.o_bd->bd_info->bi_entry_get_rw( &op2, &ros.r_ndn, oc, at, rw, ep ); rc = op2.o_bd->bd_info->bi_entry_get_rw( &op2, &mndn, oc, at, rw, ep );
if ( rc == LDAP_SUCCESS && *ep != NULL ) { if ( rc == LDAP_SUCCESS && *ep != NULL ) {
rs.sr_entry = *ep; rs.sr_entry = *ep;
@ -887,7 +890,7 @@ rwm_entry_get_rw( Operation *op, struct berval *ndn,
} }
} }
if ( ros.r_ndn.bv_val != ndn->bv_val ) { if ( !BER_BVISNULL( &ros.r_ndn) && ros.r_ndn.bv_val != ndn->bv_val ) {
op->o_tmpfree( ros.r_ndn.bv_val, op->o_tmpmemctx ); op->o_tmpfree( ros.r_ndn.bv_val, op->o_tmpmemctx );
} }