]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/modrdn.c
SLAPI - Netscape plugin API for slapd - based on patch contributed by Steve Omrani...
[openldap] / servers / slapd / modrdn.c
index 50bbaeb68a5a2feace6977f0694d6ddf5572a32b..a4dc8010386b1fb1685f59aaf9cd84ed0150462f 100644 (file)
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  */
 
 #include "portable.h"
+#include "slapi_common.h"
 
 #include <stdio.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
 
+#include "ldap_pvt.h"
 #include "slap.h"
+#include "slapi.h"
 
 int
 do_modrdn(
@@ -38,25 +46,34 @@ do_modrdn(
     Operation  *op
 )
 {
-       char    *ndn, *newrdn;
+       struct berval dn = { 0, NULL };
+       struct berval newrdn = { 0, NULL };
+       struct berval newSuperior = { 0, NULL };
        ber_int_t       deloldrdn;
+
+       struct berval pdn = { 0, NULL };
+       struct berval pnewrdn = { 0, NULL };
+       struct berval pnewSuperior = { 0, NULL }, *pnewS = NULL;
+
+       struct berval ndn = { 0, NULL };
+       struct berval nnewrdn = { 0, NULL };
+       struct berval nnewSuperior = { 0, NULL }, *nnewS = NULL;
+
        Backend *be;
-       /* Vars for LDAP v3 newSuperior support */
-       char    *newSuperior = NULL;
-       char    *nnewSuperior = NULL;
        Backend *newSuperior_be = NULL;
        ber_len_t       length;
        int rc;
+       const char *text;
+       int manageDSAit;
+
+       Slapi_PBlock *pb = op->o_pb;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ENTRY, "do_modrdn: begin\n", 0, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 );
+#endif
 
-       if( op->o_bind_in_progress ) {
-               Debug( LDAP_DEBUG_ANY, "do_modrdn: SASL bind in progress.\n",
-                       0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS,
-                       NULL, "SASL bind in progress", NULL, NULL );
-               return LDAP_SASL_BIND_IN_PROGRESS;
-       }
 
        /*
         * Parse the modrdn request.  It looks like this:
@@ -69,147 +86,276 @@ do_modrdn(
         *      }
         */
 
-       if ( ber_scanf( op->o_ber, "{aab", &ndn, &newrdn, &deloldrdn )
-           == LBER_ERROR ) {
+       if ( ber_scanf( op->o_ber, "{mmb", &dn, &newrdn, &deloldrdn )
+           == LBER_ERROR )
+       {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
+#endif
+
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
-       }
-
-       if( dn_normalize_case( ndn ) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n", ndn, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
-                   "invalid DN", NULL, NULL );
-               free( ndn );
-               free( newrdn );
-               return rc;
-       }
-
-       if( !rdn_validate( newrdn ) ) {
-               Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", newrdn, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
-                   "invalid RDN", NULL, NULL );
-               free( ndn );
-               free( newrdn );
-               return rc;
+               return SLAPD_DISCONNECT;
        }
 
        /* Check for newSuperior parameter, if present scan it */
 
        if ( ber_peek_tag( op->o_ber, &length ) == LDAP_TAG_NEWSUPERIOR ) {
-
-               if ( op->o_protocol == 0 ) {
-                       /*
-                        * Promote to LDAPv3
-                        */
-                       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-                       conn->c_protocol = LDAP_VERSION3;
-                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-                       op->o_protocol = LDAP_VERSION3;
-
-               } else if ( op->o_protocol < LDAP_VERSION3 ) {
+               if ( op->o_protocol < LDAP_VERSION3 ) {
                        /* Conection record indicates v2 but field 
                         * newSuperior is present: report error.
                         */
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, ERR,
+                               "do_modrdn: (v2) invalid field newSuperior.\n", 0, 0, 0 );
+#else
                        Debug( LDAP_DEBUG_ANY,
-                              "modrdn(v2): invalid field newSuperior!\n",
-                              0, 0, 0 );
+                           "modrdn(v2): invalid field newSuperior!\n",
+                           0, 0, 0 );
+#endif
+
                        send_ldap_disconnect( conn, op,
                                LDAP_PROTOCOL_ERROR, "newSuperior requires LDAPv3" );
-                       return -1;
+                       rc = SLAPD_DISCONNECT;
+                       goto cleanup;
                }
 
-               if ( ber_scanf( op->o_ber, "a", &newSuperior ) 
+               if ( ber_scanf( op->o_ber, "m", &newSuperior ) 
                     == LBER_ERROR ) {
 
-                   Debug( LDAP_DEBUG_ANY, "ber_scanf(\"a\"}) failed\n",
-                          0, 0, 0 );
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, ERR,
+                               "do_modrdn: ber_scanf(\"m\") failed\n", 0, 0, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY, "ber_scanf(\"m\") failed\n",
+                               0, 0, 0 );
+#endif
+
                        send_ldap_disconnect( conn, op,
                                LDAP_PROTOCOL_ERROR, "decoding error" );
-                   return -1;
-               }
-
-               nnewSuperior = ch_strdup( newSuperior );
-
-               if( dn_normalize_case( nnewSuperior ) == NULL ) {
-                       Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n",
-                               newSuperior, 0, 0 );
-                       send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
-                               "invalid (new superior) DN", NULL, NULL );
-                       free( ndn );
-                       free( newrdn );
-                       return rc;
+                       rc = SLAPD_DISCONNECT;
+                       goto cleanup;
                }
-
+               pnewS = &pnewSuperior;
+               nnewS = &nnewSuperior;
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ARGS, 
+               "do_modrdn: dn (%s) newrdn (%s) newsuperior(%s)\n",
+               dn.bv_val, newrdn.bv_val,
+               newSuperior.bv_len ? newSuperior.bv_val : "" );
+#else
        Debug( LDAP_DEBUG_ARGS,
            "do_modrdn: dn (%s) newrdn (%s) newsuperior (%s)\n",
-               ndn, newrdn,
-               newSuperior != NULL ? newSuperior : "" );
+               dn.bv_val, newrdn.bv_val,
+               newSuperior.bv_len ? newSuperior.bv_val : "" );
+#endif
 
        if ( ber_scanf( op->o_ber, /*{*/ "}") == LBER_ERROR ) {
-               free( ndn );
-               free( newrdn ); 
-               free( newSuperior );
-               free( nnewSuperior );
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
+#endif
+
                send_ldap_disconnect( conn, op,
-                               LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
+                       LDAP_PROTOCOL_ERROR, "decoding error" );
+               rc = SLAPD_DISCONNECT;
+               goto cleanup;
        }
 
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
-               free( ndn );
-               free( newrdn ); 
-               free( newSuperior );
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, "do_modrdn: get_ctrls failed\n", 0, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "do_modrdn: get_ctrls failed\n", 0, 0, 0 );
-               return rc;
+#endif
+
+               /* get_ctrls has sent results.  Now clean up. */
+               goto cleanup;
        } 
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MODRDN dn=\"%s\"\n",
-           op->o_connid, op->o_opid, ndn, 0, 0 );
+       rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
+       if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "do_modrdn: conn %d  invalid dn (%s)\n",
+                       conn->c_connid, dn.bv_val, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "do_modrdn: invalid dn (%s)\n", dn.bv_val, 0, 0 );
+#endif
+               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+                   "invalid DN", NULL, NULL );
+               goto cleanup;
+       }
+
+       if( ndn.bv_len == 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR,
+                       "do_modrdn:  attempt to modify root DSE.\n", 0, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "do_modrdn: root dse!\n", 0, 0, 0 );
+#endif
+
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "cannot rename the root DSE", NULL, NULL );
+               goto cleanup;
+
+       } else if ( bvmatch( &ndn, &global_schemandn ) ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR,
+                       "do_modrdn: attempt to modify subschema subentry: %s (%ld)\n",
+                       global_schemandn.bv_val, (long) global_schemandn.bv_len, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "do_modrdn: subschema subentry: %s (%ld)\n",
+                       global_schemandn.bv_val, (long) global_schemandn.bv_len, 0 );
+#endif
+
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "cannot rename subschema subentry", NULL, NULL );
+               goto cleanup;
+       }
+
+       /* FIXME: should have/use rdnPretty / rdnNormalize routines */
+
+       rc = dnPrettyNormal( NULL, &newrdn, &pnewrdn, &nnewrdn );
+       if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "do_modrdn: conn %d  invalid newrdn (%s)\n",
+                       conn->c_connid, newrdn.bv_val, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "do_modrdn: invalid newrdn (%s)\n", newrdn.bv_val, 0, 0 );
+#endif
+               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+                   "invalid new RDN", NULL, NULL );
+               goto cleanup;
+       }
+
+       if( rdnValidate( &pnewrdn ) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_modrdn: invalid rdn (%s).\n", pnewrdn.bv_val, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n",
+                       pnewrdn.bv_val, 0, 0 );
+#endif
+
+               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+                   "invalid new RDN", NULL, NULL );
+               goto cleanup;
+       }
+
+       if( pnewS ) {
+               rc = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior,
+                       &nnewSuperior );
+               if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, INFO, 
+                               "do_modrdn: conn %d  invalid newSuperior (%s)\n",
+                               conn->c_connid, newSuperior.bv_val, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                               "do_modrdn: invalid newSuperior (%s)\n",
+                               newSuperior.bv_val, 0, 0 );
+#endif
+                       send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+                               "invalid newSuperior", NULL, NULL );
+                       goto cleanup;
+               }
+       }
+
+       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MODRDN dn=\"%s\"\n",
+           op->o_connid, op->o_opid, pdn.bv_val, 0, 0 );
+
+       manageDSAit = get_manageDSAit( op );
 
        /*
         * We could be serving multiple database backends.  Select the
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
+       if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
+               BerVarray ref = referral_rewrite( default_referral,
+                       NULL, &pdn, LDAP_SCOPE_DEFAULT );
 
-       if ( (be = select_backend( ndn )) == NULL ) {
-               free( ndn );
-               free( newrdn ); 
-               free( newSuperior );
-               free( nnewSuperior );
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                       NULL, NULL, default_referral, NULL );
-               return rc;
+                       NULL, NULL, ref ? ref : default_referral, NULL );
+
+               ber_bvarray_free( ref );
+               goto cleanup;
+       }
+
+       /* check restrictions */
+       rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
+       if( rc != LDAP_SUCCESS ) {
+               send_ldap_result( conn, op, rc,
+                       NULL, text, NULL, NULL );
+               goto cleanup;
        }
 
+       /* check for referrals */
+       rc = backend_check_referrals( be, conn, op, &pdn, &ndn );
+       if ( rc != LDAP_SUCCESS ) {
+               goto cleanup;
+       }
 
        /* Make sure that the entry being changed and the newSuperior are in 
         * the same backend, otherwise we return an error.
         */
-       if( newSuperior != NULL ) {
-               newSuperior_be = select_backend( nnewSuperior );
+       if( pnewS ) {
+               newSuperior_be = select_backend( &nnewSuperior, 0, 0 );
 
                if ( newSuperior_be != be ) {
                        /* newSuperior is in same backend */
                        rc = LDAP_AFFECTS_MULTIPLE_DSAS;
 
                        send_ldap_result( conn, op, rc,
-                               NULL, NULL, NULL, NULL );
-
-                       free( ndn );
-                       free( newrdn );
-                       free( newSuperior );
-                       free( nnewSuperior );
+                               NULL, "cannot rename between DSAa", NULL, NULL );
 
-                       return rc;
+                       goto cleanup;
                }
+
+               /* deref suffix alias if appropriate */
+               suffix_alias( be, &nnewSuperior );
        }
 
+       /* deref suffix alias if appropriate */
+       suffix_alias( be, &ndn );
+
+#if defined( LDAP_SLAPI )
+       slapi_pblock_set( pb, SLAPI_BACKEND, (void *)be );
+       slapi_pblock_set( pb, SLAPI_CONNECTION, (void *)conn );
+       slapi_pblock_set( pb, SLAPI_OPERATION, (void *)op );
+       slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)dn.bv_val );
+       slapi_pblock_set( pb, SLAPI_MODRDN_NEWRDN, (void *)newrdn.bv_val );
+       slapi_pblock_set( pb, SLAPI_MODRDN_NEWSUPERIOR,
+                       (void *)newSuperior.bv_val );
+       slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN, (void *)deloldrdn );
+       slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)op->o_ctrls );
+       slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(1) );
+
+       rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_MODRDN_FN, pb );
+       if ( rc != 0 && rc != LDAP_OTHER ) {
+               /*
+                * either there is no preOp (modrdn) plugins
+                * or a plugin failed. Just log it
+                *
+                * FIXME: is this correct?
+                */
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_modrdn: modrdn preOps failed\n"));
+#else
+               Debug (LDAP_DEBUG_TRACE, " modrdn preOps failed.\n", 0, 0, 0);
+#endif
+       }
+#endif /* defined( LDAP_SLAPI ) */
+
        /*
         * do the add if 1 && (2 || 3)
         * 1) there is an add function implemented in this backend;
@@ -218,27 +364,218 @@ do_modrdn(
         */
        if ( be->be_modrdn ) {
                /* do the update here */
-               if ( be->be_update_ndn == NULL ||
-                       strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+               int repl_user = be_isupdate( be, &op->o_ndn );
+#ifndef SLAPD_MULTIMASTER
+               if ( !be->be_update_ndn.bv_len || repl_user )
+#endif
                {
-                       if ( (*be->be_modrdn)( be, conn, op, ndn, newrdn,
-                           deloldrdn, newSuperior ) == 0 ) {
-                               /* XXX: MAY NEED TO ADD newSuperior HERE */
-                               replog( be, LDAP_REQ_MODRDN, ndn, newrdn,
-                                   deloldrdn );
+                       if ( (*be->be_modrdn)( be, conn, op, &pdn, &ndn,
+                               &pnewrdn, &nnewrdn, deloldrdn,
+                               pnewS, nnewS ) == 0
+#ifdef SLAPD_MULTIMASTER
+                               && ( !be->be_update_ndn.bv_len || !repl_user )
+#endif
+                       ) {
+                               struct slap_replog_moddn moddn;
+                               moddn.newrdn = &pnewrdn;
+                               moddn.deloldrdn = deloldrdn;
+                               moddn.newsup = &pnewSuperior;
+
+                               replog( be, op, &pdn, &ndn, &moddn );
                        }
+#ifndef SLAPD_MULTIMASTER
                } else {
+                       BerVarray defref = be->be_update_refs
+                               ? be->be_update_refs : default_referral;
+                       BerVarray ref = referral_rewrite( defref,
+                               NULL, &pdn, LDAP_SCOPE_DEFAULT );
+
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
-                               be->be_update_refs ? be->be_update_refs : default_referral, NULL );
+                               ref ? ref : defref, NULL );
+
+                       ber_bvarray_free( ref );
+#endif
                }
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "Function not implemented", NULL, NULL );
+                       NULL, "operation not supported within namingContext",
+                       NULL, NULL );
+       }
+
+#if defined( LDAP_SLAPI )
+       rc = doPluginFNs( be, SLAPI_PLUGIN_POST_MODRDN_FN, pb );
+       if ( rc != 0 && rc != LDAP_OTHER ) {
+               /*
+                * either there is no postOp (modrdn) plugins
+                * or a plugin failed. Just log it
+                *
+                * FIXME: is this correct?
+                */
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_modrdn: modrdn postOps failed\n"));
+#else
+               Debug (LDAP_DEBUG_TRACE, " modrdn postOps failed.\n", 0, 0, 0);
+#endif
+       }
+#endif /* defined( LDAP_SLAPI ) */
+
+cleanup:
+       free( pdn.bv_val );
+       free( ndn.bv_val );
+
+       free( pnewrdn.bv_val ); 
+       free( nnewrdn.bv_val ); 
+
+       if ( pnewSuperior.bv_val ) free( pnewSuperior.bv_val );
+       if ( nnewSuperior.bv_val ) free( nnewSuperior.bv_val );
+
+       return rc;
+}
+
+int
+slap_modrdn2mods(
+       Backend         *be,
+       Connection      *conn,
+       Operation       *op,
+       Entry           *e,
+       LDAPRDN         *old_rdn,
+       LDAPRDN         *new_rdn,
+       int             deleteoldrdn,
+       Modifications   **pmod )
+{
+       int             rc = LDAP_SUCCESS;
+       const char      *text;
+       Modifications   *mod = NULL;
+       int             a_cnt, d_cnt;
+
+       assert( new_rdn != NULL );
+       assert( !deleteoldrdn || old_rdn != NULL );
+
+       /* Add new attribute values to the entry */
+       for ( a_cnt = 0; new_rdn[ 0 ][ a_cnt ]; a_cnt++ ) {
+               AttributeDescription    *desc = NULL;
+               Modifications           *mod_tmp;
+
+               rc = slap_bv2ad( &new_rdn[ 0 ][ a_cnt ]->la_attr, 
+                               &desc, &text );
+
+               if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( OPERATION, ERR, 
+                               "slap_modrdn2modlist: %s: %s (new)\n", 
+                               text, 
+                               new_rdn[ 0 ][ a_cnt ]->la_attr.bv_val, 0 );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "slap_modrdn2modlist: %s: %s (new)\n",
+                               text, 
+                               new_rdn[ 0 ][ a_cnt ]->la_attr.bv_val, 0 );
+#endif
+                       goto done;              
+               }
+
+               /* ACL check of newly added attrs */
+               if ( be && !access_allowed( be, conn, op, e, desc,
+                       &new_rdn[ 0 ][ a_cnt ]->la_value, ACL_WRITE, NULL ) ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( OPERATION, ERR, 
+                               "slap_modrdn2modlist: access to attr \"%s\" "
+                               "(new) not allowed\n", 
+                               new_rdn[ 0 ][a_cnt]->la_attr.bv_val, 0, 0 );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "slap_modrdn2modlist: access to attr \"%s\" "
+                               "(new) not allowed\n", 
+                               new_rdn[ 0 ][ a_cnt ]->la_attr.bv_val, 0, 0 );
+#endif
+                       rc = LDAP_INSUFFICIENT_ACCESS;
+                       goto done;
+               }
+
+               /* Apply modification */
+               mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications )
+                       + 2 * sizeof( struct berval ) );
+               mod_tmp->sml_desc = desc;
+               mod_tmp->sml_bvalues = ( BerVarray )( mod_tmp + 1 );
+               mod_tmp->sml_bvalues[ 0 ] = new_rdn[ 0 ][ a_cnt ]->la_value;
+               mod_tmp->sml_bvalues[ 1 ].bv_val = NULL;
+               mod_tmp->sml_op = SLAP_MOD_SOFTADD;
+               mod_tmp->sml_next = mod;
+               mod = mod_tmp;
        }
 
-       free( ndn );
-       free( newrdn ); 
-       free( newSuperior );
-       free( nnewSuperior );
+       /* Remove old rdn value if required */
+       if ( deleteoldrdn ) {
+               for ( d_cnt = 0; old_rdn[ 0 ][ d_cnt ]; d_cnt++ ) {
+                       AttributeDescription    *desc = NULL;
+                       Modifications           *mod_tmp;
+
+                       rc = slap_bv2ad( &old_rdn[ 0 ][ d_cnt ]->la_attr,
+                                       &desc, &text );
+
+                       if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "slap_modrdn2modlist: %s: %s (old)\n", 
+                                       text, 
+                                       old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val, 
+                                       0 );
+#else
+                               Debug( LDAP_DEBUG_TRACE,
+                                       "slap_modrdn2modlist: %s: %s (old)\n",
+                                       text, 
+                                       old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val, 
+                                       0 );
+#endif
+                               goto done;              
+                       }
+
+                       /* ACL check of newly added attrs */
+                       if ( be && !access_allowed( be, conn, op, e, desc,
+                               &old_rdn[ 0 ][ d_cnt ]->la_value, ACL_WRITE, 
+                               NULL ) ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "slap_modrdn2modlist: access "
+                                       "to attr \"%s\" (old) not allowed\n", 
+                                       old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val, 
+                                       0, 0 );
+#else
+                               Debug( LDAP_DEBUG_TRACE,
+                                       "slap_modrdn2modlist: access "
+                                       "to attr \"%s\" (old) not allowed\n", 
+                                       old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val,
+                                       0, 0 );
+#endif
+                               rc = LDAP_INSUFFICIENT_ACCESS;
+                               goto done;
+                       }
+
+                       /* Apply modification */
+                       mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications )
+                               + 2 * sizeof ( struct berval ) );
+                       mod_tmp->sml_desc = desc;
+                       mod_tmp->sml_bvalues = ( BerVarray )(mod_tmp+1);
+                       mod_tmp->sml_bvalues[ 0 ] 
+                               = old_rdn[ 0 ][ d_cnt ]->la_value;
+                       mod_tmp->sml_bvalues[ 1 ].bv_val = NULL;
+                       mod_tmp->sml_op = LDAP_MOD_DELETE;
+                       mod_tmp->sml_next = mod;
+                       mod = mod_tmp;
+               }
+       }
+       
+done:
+       /* LDAP v2 supporting correct attribute handling. */
+       if ( rc != LDAP_SUCCESS && mod != NULL ) {
+               Modifications *tmp;
+               for ( ; mod; mod = tmp ) {
+                       tmp = mod->sml_next;
+                       ch_free( mod );
+               }
+       }
+
+       *pmod = mod;
+
        return rc;
 }