Fix ITS#3424

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 51666859a4a702dedbe8f8254faca1391d1d90af..4b392247836ca4f5a5e3a283bef7c81b42a7ec23 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -201,16 +201,16 @@ fe_op_add( Operation *op, SlapReply *rs )
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       op->o_bd = select_backend( &e->e_nname, manageDSAit, 0 );
+       op->o_bd = select_backend( &e->e_nname, manageDSAit, 1 );
        if ( op->o_bd == NULL ) {
-               rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+               rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
-               if ( !rs->sr_ref ) rs->sr_ref = SLAPD_GLOBAL(default_referral);
+               if ( !rs->sr_ref ) rs->sr_ref = default_referral;
                if ( rs->sr_ref ) {
                        rs->sr_err = LDAP_REFERRAL;
                        send_ldap_result( op, rs );
 
-                       if ( rs->sr_ref != SLAPD_GLOBAL(default_referral) ) {
+                       if ( rs->sr_ref != default_referral ) {
                                ber_bvarray_free( rs->sr_ref );
                        }
                } else {
@@ -310,6 +310,7 @@ fe_op_add( Operation *op, SlapReply *rs )
                                be_entry_release_w( op, e );
                                e = NULL;
                        }
+                       op->ora_e = NULL;
 
 #ifndef SLAPD_MULTIMASTER
                } else {
@@ -329,17 +330,17 @@ fe_op_add( Operation *op, SlapReply *rs )
 #endif /* LDAP_SLAPI */
 
                        defref = op->o_bd->be_update_refs
-                               ? op->o_bd->be_update_refs : SLAPD_GLOBAL(default_referral);
+                               ? op->o_bd->be_update_refs : default_referral;
 
                        if ( defref != NULL ) {
                                rs->sr_ref = referral_rewrite( defref,
                                        NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
                                if ( rs->sr_ref == NULL ) rs->sr_ref = defref;
                                rs->sr_err = LDAP_REFERRAL;
-                               if (!rs->sr_ref) rs->sr_ref = SLAPD_GLOBAL(default_referral);
+                               if (!rs->sr_ref) rs->sr_ref = default_referral;
                                send_ldap_result( op, rs );
 
-                               if ( rs->sr_ref != SLAPD_GLOBAL(default_referral) ) {
+                               if ( rs->sr_ref != default_referral ) {
                                        ber_bvarray_free( rs->sr_ref );
                                }
                        } else {