Add ability to cache negative results and specify negative TTL on templates

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 98902ae156fd540617e07e0bf961620f9e41e171..328f49ec60feac9ea65b2c7790ecd362980ca96f 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -171,8 +171,8 @@ do_modrdn(
                }
        }
 
-       /* FIXME: temporary? */
        op->orr_deleteoldrdn = deloldrdn;
+       op->orr_modlist = NULL;
 
        /* prepare modlist of modifications from old/new RDN */
        rs->sr_err = slap_modrdn2mods( op, rs );
@@ -208,7 +208,7 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
        Backend         *newSuperior_be = NULL;
        int             manageDSAit;
        struct berval   pdn = BER_BVNULL;
-       BackendDB       *op_be;
+       BackendDB       *op_be, *bd = op->o_bd;
        
        if( op->o_req_ndn.bv_len == 0 ) {
                Debug( LDAP_DEBUG_ANY, "do_modrdn: root dse!\n", 0, 0, 0 );
@@ -238,22 +238,19 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
         */
        op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 1 );
        if ( op->o_bd == NULL ) {
+               op->o_bd = bd;
                rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
                if (!rs->sr_ref) rs->sr_ref = default_referral;
 
                if ( rs->sr_ref != NULL ) {
                        rs->sr_err = LDAP_REFERRAL;
-                       op->o_bd = frontendDB;
                        send_ldap_result( op, rs );
-                       op->o_bd = NULL;
 
                        if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
                } else {
-                       op->o_bd = frontendDB;
                        send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                                "no global superior knowledge" );
-                       op->o_bd = NULL;
                }
                goto cleanup;
        }
@@ -381,6 +378,7 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
        }
 
 cleanup:;
+       op->o_bd = bd;
        return rs->sr_err;
 }
 
@@ -399,7 +397,7 @@ slap_modrdn2mods(
        if ( ldap_bv2rdn_x( &op->oq_modrdn.rs_newrdn, &new_rdn,
                (char **)&rs->sr_text, LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx ) ) {
                Debug( LDAP_DEBUG_TRACE,
-                       LDAP_XSTRING(slap_modrdn2mods) ": can't figure out "
+                       "slap_modrdn2mods: can't figure out "
                        "type(s)/value(s) of newrdn\n", 0, 0, 0 );
                rs->sr_err = LDAP_INVALID_DN_SYNTAX;
                rs->sr_text = "unknown type(s) used in RDN";
@@ -410,7 +408,7 @@ slap_modrdn2mods(
                if ( ldap_bv2rdn_x( &op->o_req_dn, &old_rdn,
                        (char **)&rs->sr_text, LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx ) ) {
                        Debug( LDAP_DEBUG_TRACE,
-                               LDAP_XSTRING(slap_modrdn2mods) ": can't figure out "
+                               "slap_modrdn2mods: can't figure out "
                                "type(s)/value(s) of oldrdn\n", 0, 0, 0 );
                        rs->sr_err = LDAP_OTHER;
                        rs->sr_text = "cannot parse RDN from old DN";
@@ -436,6 +434,7 @@ slap_modrdn2mods(
                /* Apply modification */
                mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) );
                mod_tmp->sml_desc = desc;
+               BER_BVZERO( &mod_tmp->sml_type );
                mod_tmp->sml_values = ( BerVarray )ch_malloc( 2 * sizeof( struct berval ) );
                ber_dupbv( &mod_tmp->sml_values[0], &new_rdn[a_cnt]->la_value );
                mod_tmp->sml_values[1].bv_val = NULL;
@@ -452,7 +451,7 @@ slap_modrdn2mods(
                        mod_tmp->sml_nvalues = NULL;
                }
                mod_tmp->sml_op = SLAP_MOD_SOFTADD;
-               mod_tmp->sml_flags = SLAP_MOD_INTERNAL;
+               mod_tmp->sml_flags = 0;
                mod_tmp->sml_next = op->orr_modlist;
                op->orr_modlist = mod_tmp;
        }
@@ -476,6 +475,7 @@ slap_modrdn2mods(
                        /* Apply modification */
                        mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) );
                        mod_tmp->sml_desc = desc;
+                       BER_BVZERO( &mod_tmp->sml_type );
                        mod_tmp->sml_values = ( BerVarray )ch_malloc( 2 * sizeof( struct berval ) );
                        ber_dupbv( &mod_tmp->sml_values[0], &old_rdn[d_cnt]->la_value );
                        mod_tmp->sml_values[1].bv_val = NULL;
@@ -492,7 +492,7 @@ slap_modrdn2mods(
                                mod_tmp->sml_nvalues = NULL;
                        }
                        mod_tmp->sml_op = LDAP_MOD_DELETE;
-                       mod_tmp->sml_flags = SLAP_MOD_INTERNAL;
+                       mod_tmp->sml_flags = 0;
                        mod_tmp->sml_next = op->orr_modlist;
                        op->orr_modlist = mod_tmp;
                }