ITS#4310 seems to affect also back-ldbm

[openldap] / servers / slapd / back-ldbm / modrdn.c

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index a88da9c5185f9a7443b106ef3244589ebeb83e2e..668939f9b81e39094cd253f2bd4a8cb95931e049 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ ldbm_back_modrdn(
        Entry           *e, *p = NULL;
        Entry           *matched;
        /* LDAP v2 supporting correct attribute handling. */
-       LDAPRDN         new_rdn = NULL;
-       LDAPRDN         old_rdn = NULL;
        int             rc_id = 0;
        ID              id = NOID;
        char            textbuf[SLAP_TEXT_BUFLEN];
@@ -58,7 +56,6 @@ ldbm_back_modrdn(
        struct berval   *np_ndn = NULL; /* newSuperior ndn */
        struct berval   *new_parent_dn = NULL;  /* np_dn, p_dn, or NULL */
        /* Used to interface with ldbm_modify_internal() */
-       Modifications   *mod = NULL;            /* Used to delete old/add new rdn */
        int             manageDSAit = get_manageDSAit( op );
 
        Debug( LDAP_DEBUG_TRACE,
@@ -67,6 +64,9 @@ ldbm_back_modrdn(
                ( op->oq_modrdn.rs_newSup && op->oq_modrdn.rs_newSup->bv_len )
                        ? op->oq_modrdn.rs_newSup->bv_val : "NULL", 0 );
 
+       if ( !SLAP_SHADOW( op->o_bd ))
+               slap_mods_opattrs( op, &op->orr_modlist, 1 );
+
        /* grab giant lock for writing */
        ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
 
@@ -333,48 +333,10 @@ ldbm_back_modrdn(
            "ldbm_back_modrdn: new ndn=%s does not exist\n",
            new_ndn.bv_val, 0, 0 );
 
-       /* Get attribute type and attribute value of our new rdn, we will
-        * need to add that to our new entry
-        */
-       if ( ldap_bv2rdn( &op->oq_modrdn.rs_newrdn, &new_rdn, (char **)&rs->sr_text,
-               LDAP_DN_FORMAT_LDAP ) )
-       {
-               Debug( LDAP_DEBUG_TRACE,
-                       "ldbm_back_modrdn: can't figure out "
-                       "type(s)/values(s) of newrdn\n", 
-                       0, 0, 0 );
-               send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX,
-                                   "unknown type(s) used in RDN" );
-               goto return_results;            
-       }
-
-       Debug( LDAP_DEBUG_TRACE,
-               "ldbm_back_modrdn: new_rdn_type=\"%s\", "
-               "new_rdn_val=\"%s\"\n",
-               new_rdn[ 0 ]->la_attr.bv_val,
-               new_rdn[ 0 ]->la_value.bv_val, 0 );
-
-       if ( op->oq_modrdn.rs_deleteoldrdn ) {
-               if ( ldap_bv2rdn( &op->o_req_dn, &old_rdn, (char **)&rs->sr_text,
-                       LDAP_DN_FORMAT_LDAP ) )
-               {
-                       Debug( LDAP_DEBUG_TRACE,
-                               "ldbm_back_modrdn: can't figure out "
-                               "the old_rdn type(s)/value(s)\n", 
-                               0, 0, 0 );
-                       send_ldap_error( op, rs, LDAP_OTHER,
-                                   "cannot parse RDN from old DN" );
-                       goto return_results;            
-               }
-       }
-
        Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DN_X500\n",
               0, 0, 0 );
        
-       if ( slap_modrdn2mods( op, rs, e, old_rdn, new_rdn, &mod ) != LDAP_SUCCESS ) {
-               send_ldap_result( op, rs );
-               goto return_results;
-       }
+       assert( op->orr_modlist != NULL );
 
        /* check for abandon */
        if ( op->o_abandon ) {
@@ -396,7 +358,7 @@ ldbm_back_modrdn(
         */
 
        /* modify memory copy of entry */
-       rs->sr_err = ldbm_modify_internal( op, &mod[0], e,
+       rs->sr_err = ldbm_modify_internal( op, op->orr_modlist, e,
                &rs->sr_text, textbuf, textlen );
        switch ( rs->sr_err ) {
        case LDAP_SUCCESS:
@@ -464,28 +426,6 @@ return_results:
        if( new_ndn.bv_val != NULL ) free( new_ndn.bv_val );
        if( old_ndn.bv_val != NULL ) free( old_ndn.bv_val );
 
-       /* LDAP v2 supporting correct attribute handling. */
-       if ( new_rdn != NULL ) {
-               ldap_rdnfree( new_rdn );
-       }
-       if ( old_rdn != NULL ) {
-               ldap_rdnfree( old_rdn );
-       }
-       if ( mod != NULL ) {
-               Modifications *tmp;
-               for (; mod; mod = tmp ) {
-                       /* slap_modrdn2mods does things one way,
-                        * slap_mods_opattrs does it differently
-                        */
-                       if ( mod->sml_op != SLAP_MOD_SOFTADD &&
-                               mod->sml_op != LDAP_MOD_DELETE ) break;
-                       if ( mod->sml_nvalues ) free( mod->sml_nvalues[0].bv_val );
-                       tmp = mod->sml_next;
-                       free( mod );
-               }
-               slap_mods_free( mod, 1 );
-       }
-
        /* LDAP v3 Support */
        if( np != NULL ) {
                /* free new parent and writer lock */