upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 18:18:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix referral handling

Browse source
This commit is contained in:
Howard Chu 2011-08-26 17:46:10 -07:00
parent 07d2443ad0
commit bd5c7b74fe
5 changed files with 60 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
servers/slapd/back-mdb/add.c
View file

@ -166,9 +166,14 @@ txnReturn:
if ( !bvmatch( &pdn, &p->e_nname ) ) {
rs->sr_matched = ber_strdup_x( p->e_name.bv_val,
op->o_tmpmemctx );
rs->sr_ref = p != (Entry *)&slap_entry_root &&
is_entry_referral( p ) ? get_entry_referrals( op, p )
: NULL;
if ( p != (Entry *)&slap_entry_root && is_entry_referral( p )) {
BerVarray ref = get_entry_referrals( op, p );
rs->sr_ref = referral_rewrite( ref, &p->e_name,
&op->o_req_dn, LDAP_SCOPE_DEFAULT );
ber_bvarray_free( ref );
} else {
rs->sr_ref = NULL;
}
if ( p != (Entry *)&slap_entry_root )
mdb_entry_return( p );
p = NULL;
@ -223,10 +228,13 @@ txnReturn:
}
if ( is_entry_referral( p ) ) {
BerVarray ref = get_entry_referrals( op, p );
/* parent is a referral, don't allow add */
rs->sr_matched = ber_strdup_x( p->e_name.bv_val,
op->o_tmpmemctx );
rs->sr_ref = get_entry_referrals( op, p );
rs->sr_ref = referral_rewrite( ref, &p->e_name,
&op->o_req_dn, LDAP_SCOPE_DEFAULT );
ber_bvarray_free( ref );
mdb_entry_return( p );
p = NULL;
Debug( LDAP_DEBUG_TRACE,

12
servers/slapd/back-mdb/compare.c
View file

@ -67,12 +67,16 @@ mdb_compare( Operation *op, SlapReply *rs )
} else {
rs->sr_matched = ch_strdup( e->e_dn );
rs->sr_ref = is_entry_referral( e )
? get_entry_referrals( op, e )
: NULL;
if ( is_entry_referral( e )) {
BerVarray ref = get_entry_referrals( op, e );
rs->sr_ref = referral_rewrite( ref, &e->e_name,
&op->o_req_dn, LDAP_SCOPE_DEFAULT );
ber_bvarray_free( ref );
} else {
rs->sr_ref = NULL;
}
rs->sr_err = LDAP_REFERRAL;
}
mdb_entry_return( e );
e = NULL;

33
servers/slapd/back-mdb/delete.c
View file

@ -138,9 +138,14 @@ txnReturn:
if ( p && !BER_BVISEMPTY( &p->e_name )) {
rs->sr_matched = ch_strdup( p->e_name.bv_val );
rs->sr_ref = ( is_entry_referral( p ))
? get_entry_referrals( op, p )
: NULL;
if ( is_entry_referral( p )) {
BerVarray ref = get_entry_referrals( op, p );
rs->sr_ref = referral_rewrite( ref, &p->e_name,
&op->o_req_dn, LDAP_SCOPE_DEFAULT );
ber_bvarray_free( ref );
} else {
rs->sr_ref = NULL;
}
} else {
rs->sr_ref = referral_rewrite( default_referral, NULL,
&op->o_req_dn, LDAP_SCOPE_DEFAULT );
@ -158,8 +163,10 @@ txnReturn:
/* get entry */
rs->sr_err = mdb_dn2entry( op, txn, &op->o_req_ndn, &e, 0 );
switch( rs->sr_err ) {
case 0:
case MDB_NOTFOUND:
e = p;
p = NULL;
case 0:
break;
case LDAP_BUSY:
rs->sr_text = "ldap server busy";
@ -176,15 +183,17 @@ txnReturn:
"<=- " LDAP_XSTRING(mdb_delete) ": no such object %s\n",
op->o_req_dn.bv_val, 0, 0);
rs->sr_matched = ch_strdup( p->e_dn );
rs->sr_ref = is_entry_referral( p )
? get_entry_referrals( op, p ) : NULL;
if ( e ) {
mdb_entry_return( e );
e = NULL;
rs->sr_matched = ch_strdup( e->e_dn );
if ( is_entry_referral( e )) {
BerVarray ref = get_entry_referrals( op, e );
rs->sr_ref = referral_rewrite( ref, &e->e_name,
&op->o_req_dn, LDAP_SCOPE_DEFAULT );
ber_bvarray_free( ref );
} else {
rs->sr_ref = NULL;
}
mdb_entry_return( p );
p = NULL;
mdb_entry_return( e );
e = NULL;
rs->sr_err = LDAP_REFERRAL;
rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;

11
servers/slapd/back-mdb/modify.c
View file

@ -506,9 +506,14 @@ txnReturn:
{
if ( e != NULL ) {
rs->sr_matched = ch_strdup( e->e_dn );
rs->sr_ref = is_entry_referral( e )
? get_entry_referrals( op, e )
: NULL;
if ( is_entry_referral( e )) {
BerVarray ref = get_entry_referrals( op, e );
rs->sr_ref = referral_rewrite( ref, &e->e_name,
&op->o_req_dn, LDAP_SCOPE_DEFAULT );
ber_bvarray_free( ref );
} else {
rs->sr_ref = NULL;
}
mdb_entry_return( e );
e = NULL;

15
servers/slapd/back-mdb/modrdn.c
View file

@ -186,8 +186,10 @@ txnReturn:
/* get entry */
rs->sr_err = mdb_dn2entry( op, txn, &op->o_req_ndn, &e, 0 );
switch( rs->sr_err ) {
case 0:
case MDB_NOTFOUND:
e = p;
p = NULL;
case 0:
break;
case LDAP_BUSY:
rs->sr_text = "ldap server busy";
@ -204,9 +206,14 @@ txnReturn:
{
if( e != NULL ) {
rs->sr_matched = ch_strdup( e->e_dn );
rs->sr_ref = is_entry_referral( e )
? get_entry_referrals( op, e )
: NULL;
if ( is_entry_referral( e )) {
BerVarray ref = get_entry_referrals( op, e );
rs->sr_ref = referral_rewrite( ref, &e->e_name,
&op->o_req_dn, LDAP_SCOPE_DEFAULT );
ber_bvarray_free( ref );
} else {
rs->sr_ref = NULL;
}
mdb_entry_return( e );
e = NULL;