]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/modify.c
seems to fix the equivalent of ITS#4429 in back-meta; had to give up per-target conn...
[openldap] / servers / slapd / modify.c
index ef204292173605db0983cfdcfbd766527d59d929..9770919784b8283a008b4a3c9cce0c8c9eef0b14 100644 (file)
@@ -1,7 +1,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
@@ -140,7 +140,7 @@ do_modify(
                                        goto cleanup;
                                }
 
-                               if( mod->sml_values[1].bv_val ) {
+                               if ( !BER_BVISNULL( &mod->sml_values[ 1 ] ) ) {
                                        Debug( LDAP_DEBUG_ANY, "do_modify: modify/increment "
                                                "operation (%ld) requires single value\n",
                                                (long) mop, 0, 0 );
@@ -171,7 +171,6 @@ do_modify(
 
        if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );
-
                goto cleanup;
        }
 
@@ -184,8 +183,8 @@ do_modify(
                goto cleanup;
        }
 
-       rs->sr_err = slap_mods_check( modlist, &rs->sr_text,
-               textbuf, textlen, NULL );
+       rs->sr_err = slap_mods_check( modlist,
+               &rs->sr_text, textbuf, textlen, NULL );
 
        if ( rs->sr_err != LDAP_SUCCESS ) {
                send_ldap_result( op, rs );
@@ -199,9 +198,14 @@ do_modify(
        op->o_bd = frontendDB;
        rs->sr_err = frontendDB->be_modify( op, rs );
 
-cleanup:
-       slap_graduate_commit_csn( op );
+#ifdef LDAP_X_TXN
+       if( rs->sr_err == LDAP_X_TXN_SPECIFY_OKAY ) {
+               /* skip cleanup */
+               return rs->sr_err;
+       }
+#endif
 
+cleanup:
        op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
        op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
        if ( op->orm_modlist != NULL ) slap_mods_free( op->orm_modlist, 1 );
@@ -216,14 +220,11 @@ fe_op_modify( Operation *op, SlapReply *rs )
        Modifications   *tmp;
 #endif
        int             manageDSAit;
-       Modifications   *modlist = op->orm_modlist;
-       Modifications   **modtail = &modlist;
-       int             increment = op->orm_increment;
-       BackendDB *op_be;
+       BackendDB       *op_be, *bd = op->o_bd;
        char            textbuf[ SLAP_TEXT_BUFLEN ];
        size_t          textlen = sizeof( textbuf );
        
-       if( op->o_req_ndn.bv_len == 0 ) {
+       if ( BER_BVISEMPTY( &op->o_req_ndn ) ) {
                Debug( LDAP_DEBUG_ANY, "do_modify: root dse!\n", 0, 0, 0 );
 
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
@@ -241,7 +242,7 @@ fe_op_modify( Operation *op, SlapReply *rs )
 #ifdef LDAP_DEBUG
        Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
 
-       for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
+       for ( tmp = op->orm_modlist; tmp != NULL; tmp = tmp->sml_next ) {
                Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n",
                        tmp->sml_op == LDAP_MOD_ADD ? "add" :
                                (tmp->sml_op == LDAP_MOD_INCREMENT ? "increment" :
@@ -251,10 +252,10 @@ fe_op_modify( Operation *op, SlapReply *rs )
                if ( tmp->sml_values == NULL ) {
                        Debug( LDAP_DEBUG_ARGS, "%s\n",
                           "\t\tno values", NULL, NULL );
-               } else if ( tmp->sml_values[0].bv_val == NULL ) {
+               } else if ( BER_BVISNULL( &tmp->sml_values[ 0 ] ) ) {
                        Debug( LDAP_DEBUG_ARGS, "%s\n",
                           "\t\tzero values", NULL, NULL );
-               } else if ( tmp->sml_values[1].bv_val == NULL ) {
+               } else if ( BER_BVISNULL( &tmp->sml_values[ 1 ] ) ) {
                        Debug( LDAP_DEBUG_ARGS, "%s, length %ld\n",
                           "\t\tone value", (long) tmp->sml_values[0].bv_len, NULL );
                } else {
@@ -270,12 +271,12 @@ fe_op_modify( Operation *op, SlapReply *rs )
                Statslog( LDAP_DEBUG_STATS, "%s MOD dn=\"%s\"\n",
                        op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
 
-               for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
+               for ( tmp = op->orm_modlist; tmp != NULL; tmp = tmp->sml_next ) {
                        if (len + 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
                                Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
                                    op->o_log_prefix, abuf, 0, 0, 0 );
 
-                               len = 0;
+                               len = 0;
                                ptr = abuf;
 
                                if( 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
@@ -307,22 +308,24 @@ fe_op_modify( 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 ) {
+                       rs->sr_ref = default_referral;
+               }
 
-               if (rs->sr_ref != NULL ) {
+               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 );
+                       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;
        }
@@ -334,17 +337,17 @@ fe_op_modify( Operation *op, SlapReply *rs )
        }
 
        /* check restrictions */
-       if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
+       if ( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
                send_ldap_result( op, rs );
                goto cleanup;
        }
 
        /* check for referrals */
-       if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
+       if ( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
                goto cleanup;
        }
 
-       rs->sr_err = slap_mods_obsolete_check( op, modlist,
+       rs->sr_err = slap_mods_obsolete_check( op, op->orm_modlist,
                &rs->sr_text, textbuf, textlen );
        if ( rs->sr_err != LDAP_SUCCESS ) {
                send_ldap_result( op, rs );
@@ -352,7 +355,7 @@ fe_op_modify( Operation *op, SlapReply *rs )
        }
 
        /* check for modify/increment support */
-       ifincrement && !SLAP_INCREMENT( op->o_bd ) ) {
+       if ( op->orm_increment && !SLAP_INCREMENT( op->o_bd ) ) {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                        "modify/increment not supported in context" );
        }
@@ -367,20 +370,18 @@ fe_op_modify( Operation *op, SlapReply *rs )
                /* do the update here */
                int repl_user = be_isupdate( op );
 
-               /* Multimaster slapd does not have to check for replicator dn
+               /*
+                * Multimaster slapd does not have to check for replicator dn
                 * because it accepts each modify request
                 */
-#ifndef SLAPD_MULTIMASTER
-               if ( !SLAP_SHADOW(op->o_bd) || repl_user )
-#endif
-               {
-                       int             update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn );
-                       slap_callback   cb = { NULL, slap_replog_cb, NULL, NULL };
+               if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user ) {
+                       int update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn );
+                       slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
 
                        op->o_bd = op_be;
 
                        if ( !update ) {
-                               rs->sr_err = slap_mods_no_user_mod_check( op, modlist,
+                               rs->sr_err = slap_mods_no_user_mod_check( op, op->orm_modlist,
                                        &rs->sr_text, textbuf, textlen );
                                if ( rs->sr_err != LDAP_SUCCESS ) {
                                        send_ldap_result( op, rs );
@@ -389,26 +390,6 @@ fe_op_modify( Operation *op, SlapReply *rs )
                        }
 
                        if ( !repl_user ) {
-                               for( modtail = &modlist;
-                                       *modtail != NULL;
-                                       modtail = &(*modtail)->sml_next )
-                               {
-                                       /* empty */
-                               }
-
-                               rs->sr_err = slap_mods_opattrs( op, modlist, modtail,
-                                       &rs->sr_text, textbuf, textlen, 1 );
-                               if( rs->sr_err != LDAP_SUCCESS ) {
-                                       send_ldap_result( op, rs );
-                                       goto cleanup;
-                               }
-                       }
-
-                       op->orm_modlist = modlist;
-#ifdef SLAPD_MULTIMASTER
-                       if ( !repl_user )
-#endif
-                       {
                                /* but multimaster slapd logs only the ones 
                                 * not from a replicator user */
                                cb.sc_next = op->o_callback;
@@ -416,9 +397,7 @@ fe_op_modify( Operation *op, SlapReply *rs )
                        }
                        op->o_bd->be_modify( op, rs );
 
-#ifndef SLAPD_MULTIMASTER
-               /* send a referral */
-               } else {
+               } else { /* send a referral */
                        BerVarray defref = op->o_bd->be_update_refs
                                ? op->o_bd->be_update_refs : default_referral;
                        if ( defref != NULL ) {
@@ -440,14 +419,15 @@ fe_op_modify( Operation *op, SlapReply *rs )
                                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                                        "shadow context; no update referral" );
                        }
-#endif
                }
+
        } else {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                    "operation not supported within namingContext" );
        }
 
 cleanup:;
+       op->o_bd = bd;
        return rs->sr_err;
 }
 
@@ -497,10 +477,13 @@ slap_mods_no_user_mod_check(
        size_t textlen )
 {
        for ( ; ml != NULL; ml = ml->sml_next ) {
-               if ( !is_at_no_user_mod( ml->sml_desc->ad_type ) ) continue;
+               if ( !is_at_no_user_mod( ml->sml_desc->ad_type ) ) {
+                       continue;
+               }
 
-               if( get_manageDIT( op )) {
+               if ( get_manageDIT( op ) ) {
                        if ( ml->sml_desc->ad_type->sat_flags & SLAP_AT_MANAGEABLE ) {
+                               ml->sml_flags |= SLAP_MOD_MANAGING;
                                continue;
                        }
 
@@ -543,6 +526,7 @@ slap_mods_no_repl_user_mod_check(
                                snprintf( textbuf, textlen,
                                        "attribute '%s' provided more than once",
                                        mods->sml_desc->ad_cname.bv_val );
+                               *text = textbuf;
                                return LDAP_TYPE_OR_VALUE_EXISTS;
                        }
                }
@@ -668,7 +652,7 @@ int slap_mods_check(
                         * check that each value is valid per syntax
                         *      and pretty if appropriate
                         */
-                       for ( nvals = 0; ml->sml_values[nvals].bv_val; nvals++ ) {
+                       for ( nvals = 0; !BER_BVISNULL( &ml->sml_values[nvals] ); nvals++ ) {
                                struct berval pval;
 
                                if ( pretty ) {
@@ -682,7 +666,7 @@ int slap_mods_check(
                                } else {
 #ifdef SLAP_ORDERED_PRETTYNORM
                                        rc = ordered_value_validate( ad,
-                                               &ml->sml_values[nvals] );
+                                               &ml->sml_values[nvals], ml->sml_op );
 #else /* ! SLAP_ORDERED_PRETTYNORM */
                                        rc = validate( ad->ad_type->sat_syntax,
                                                &ml->sml_values[nvals] );
@@ -731,7 +715,7 @@ int slap_mods_check(
                                ml->sml_nvalues = ber_memalloc_x(
                                        (nvals+1)*sizeof(struct berval), ctx );
 
-                               for ( nvals = 0; ml->sml_values[nvals].bv_val; nvals++ ) {
+                               for ( nvals = 0; !BER_BVISNULL( &ml->sml_values[nvals] ); nvals++ ) {
 #ifdef SLAP_ORDERED_PRETTYNORM
                                        rc = ordered_value_normalize(
                                                SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
@@ -824,35 +808,64 @@ void slap_timestamp( time_t *tm, struct berval *bv )
 #endif
 }
 
-int slap_mods_opattrs(
+/* Called for all modify and modrdn ops. If the current op was replicated
+ * from elsewhere, all of the attrs should already be present.
+ */
+void slap_mods_opattrs(
        Operation *op,
-       Modifications *mods,
-       Modifications **modtail,
-       const char **text,
-       char *textbuf, size_t textlen,
+       Modifications **modsp,
        int manage_ctxcsn )
 {
-       struct berval name, timestamp, csn;
+       struct berval name, timestamp, csn = BER_BVNULL;
        struct berval nname;
        char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
        char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
-       Modifications *mod;
-
-       int mop = op->o_tag == LDAP_REQ_ADD
-               ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
-
-       assert( modtail != NULL );
-       assert( *modtail == NULL );
+       Modifications *mod, **modtail, *modlast;
+       int gotcsn = 0, gotmname = 0, gotmtime = 0;
 
        if ( SLAP_LASTMOD( op->o_bd ) ) {
-               time_t now = slap_get_time();
-
-               slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, manage_ctxcsn );
-
+               char *ptr;
                timestamp.bv_val = timebuf;
-               timestamp.bv_len = sizeof(timebuf);
+               for ( modtail = modsp; *modtail; modtail = &(*modtail)->sml_next ) {
+                       if ( (*modtail)->sml_op != LDAP_MOD_ADD &&
+                               (*modtail)->sml_op != LDAP_MOD_REPLACE ) continue;
+                       if ( (*modtail)->sml_desc == slap_schema.si_ad_entryCSN ) {
+                               csn = (*modtail)->sml_values[0];
+                               gotcsn = 1;
+                       } else
+                       if ( (*modtail)->sml_desc == slap_schema.si_ad_modifiersName ) {
+                               gotmname = 1;
+                       } else
+                       if ( (*modtail)->sml_desc == slap_schema.si_ad_modifyTimestamp ) {
+                               gotmtime = 1;
+                       }
+               }
+               if ( BER_BVISEMPTY( &op->o_csn )) {
+                       if ( !gotcsn ) {
+                               csn.bv_val = csnbuf;
+                               csn.bv_len = sizeof( csnbuf );
+                               slap_get_csn( op, &csn, manage_ctxcsn );
+                       } else {
+                               if ( manage_ctxcsn )
+                                       slap_queue_csn( op, &csn );
+                       }
+               } else {
+                       csn = op->o_csn;
+               }
+               ptr = ber_bvchr( &csn, '#' );
+               if ( ptr ) {
+                       timestamp.bv_len = ptr - csn.bv_val;
+                       if ( timestamp.bv_len >= sizeof( timebuf ))     /* ?!? */
+                               timestamp.bv_len = sizeof( timebuf ) - 1;
+                       AC_MEMCPY( timebuf, csn.bv_val, timestamp.bv_len );
+                       timebuf[timestamp.bv_len] = '\0';
+               } else {
+                       time_t now = slap_get_time();
+
+                       timestamp.bv_len = sizeof(timebuf);
 
-               slap_timestamp( &now, &timestamp );
+                       slap_timestamp( &now, &timestamp );
+               }
 
                if ( BER_BVISEMPTY( &op->o_dn ) ) {
                        BER_BVSTR( &name, SLAPD_ANONYMOUS );
@@ -861,218 +874,59 @@ int slap_mods_opattrs(
                        name = op->o_dn;
                        nname = op->o_ndn;
                }
-       }
-
-       if ( op->o_tag == LDAP_REQ_ADD ) {
-               struct berval tmpval;
-
-               mod = *modtail;
-               if ( get_manageDIT( op ) ) {
-                       for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
-                               if ( mod->sml_desc == slap_schema.si_ad_structuralObjectClass ) {
-                                       break;
-                               }
-                       }
-
-               }
-
-               if ( mod == *modtail ) {
-                       int rc = mods_structural_class( mods, &tmpval,
-                               text, textbuf, textlen );
-                       if( rc != LDAP_SUCCESS ) return rc;
 
+               if ( !gotcsn ) {
                        mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-                       mod->sml_op = mop;
+                       mod->sml_op = LDAP_MOD_REPLACE;
                        mod->sml_flags = SLAP_MOD_INTERNAL;
-                       mod->sml_type.bv_val = NULL;
-                       mod->sml_desc = slap_schema.si_ad_structuralObjectClass;
-                       mod->sml_values =
-                               (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                       ber_dupbv( &mod->sml_values[0], &tmpval );
-                       mod->sml_values[1].bv_len = 0;
-                       mod->sml_values[1].bv_val = NULL;
-                       assert( mod->sml_values[0].bv_val != NULL );
-                       mod->sml_nvalues =
-                               (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                       ber_dupbv( &mod->sml_nvalues[0], &tmpval );
-                       mod->sml_nvalues[1].bv_len = 0;
-                       mod->sml_nvalues[1].bv_val = NULL;
-                       assert( mod->sml_nvalues[0].bv_val != NULL );
+                       mod->sml_next = NULL;
+                       BER_BVZERO( &mod->sml_type );
+                       mod->sml_desc = slap_schema.si_ad_entryCSN;
+                       mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                       ber_dupbv( &mod->sml_values[0], &csn );
+                       BER_BVZERO( &mod->sml_values[1] );
+                       assert( !BER_BVISNULL( &mod->sml_values[0] ) );
+                       mod->sml_nvalues = NULL;
                        *modtail = mod;
+                       modlast = mod;
                        modtail = &mod->sml_next;
                }
 
-               if ( SLAP_LASTMOD( op->o_bd ) ) {
-                       mod = *modtail;
-                       if ( get_manageDIT( op ) ) {
-                               for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
-                                       if ( mod->sml_desc == slap_schema.si_ad_entryUUID ) {
-                                               break;
-                                       }
-                               }
-                       }
-
-                       if ( mod == *modtail ) {
-                               char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
-
-                               tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
-                               tmpval.bv_val = uuidbuf;
-                       
-                               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-                               mod->sml_op = mop;
-                               mod->sml_flags = SLAP_MOD_INTERNAL;
-                               mod->sml_type.bv_val = NULL;
-                               mod->sml_desc = slap_schema.si_ad_entryUUID;
-                               mod->sml_values =
-                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                               ber_dupbv( &mod->sml_values[0], &tmpval );
-                               mod->sml_values[1].bv_len = 0;
-                               mod->sml_values[1].bv_val = NULL;
-                               assert( mod->sml_values[0].bv_val != NULL );
-                               mod->sml_nvalues =
-                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                               (*mod->sml_desc->ad_type->sat_equality->smr_normalize)(
-                                               SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-                                               mod->sml_desc->ad_type->sat_syntax,
-                                               mod->sml_desc->ad_type->sat_equality,
-                                               mod->sml_values, mod->sml_nvalues, NULL );
-                               mod->sml_nvalues[1].bv_len = 0;
-                               mod->sml_nvalues[1].bv_val = NULL;
-                               *modtail = mod;
-                               modtail = &mod->sml_next;
-                       }
-
-                       mod = *modtail;
-                       if ( get_manageDIT( op ) ) {
-                               for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
-                                       if ( mod->sml_desc == slap_schema.si_ad_creatorsName ) {
-                                               break;
-                                       }
-                               }
-                       }
-
-                       if ( mod == *modtail ) {
-                               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-                               mod->sml_op = mop;
-                               mod->sml_flags = SLAP_MOD_INTERNAL;
-                               mod->sml_type.bv_val = NULL;
-                               mod->sml_desc = slap_schema.si_ad_creatorsName;
-                               mod->sml_values =
-                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                               ber_dupbv( &mod->sml_values[0], &name );
-                               mod->sml_values[1].bv_len = 0;
-                               mod->sml_values[1].bv_val = NULL;
-                               assert( mod->sml_values[0].bv_val != NULL );
-                               mod->sml_nvalues =
-                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                               ber_dupbv( &mod->sml_nvalues[0], &nname );
-                               mod->sml_nvalues[1].bv_len = 0;
-                               mod->sml_nvalues[1].bv_val = NULL;
-                               assert( mod->sml_nvalues[0].bv_val != NULL );
-                               *modtail = mod;
-                               modtail = &mod->sml_next;
-                       }
-       
-                       mod = *modtail;
-                       if ( get_manageDIT( op ) ) {
-                               for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
-                                       if ( mod->sml_desc == slap_schema.si_ad_createTimestamp ) {
-                                               break;
-                                       }
-                               }
-                       }
-
-                       if ( mod == *modtail ) {
-                               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-                               mod->sml_op = mop;
-                               mod->sml_flags = SLAP_MOD_INTERNAL;
-                               mod->sml_type.bv_val = NULL;
-                               mod->sml_desc = slap_schema.si_ad_createTimestamp;
-                               mod->sml_values =
-                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                               ber_dupbv( &mod->sml_values[0], &timestamp );
-                               mod->sml_values[1].bv_len = 0;
-                               mod->sml_values[1].bv_val = NULL;
-                               assert( mod->sml_values[0].bv_val != NULL );
-                               mod->sml_nvalues = NULL;
-                               *modtail = mod;
-                               modtail = &mod->sml_next;
-                       }
-               }
-       }
-
-       if ( SLAP_LASTMOD( op->o_bd ) ) {
-               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-               mod->sml_op = mop;
-               mod->sml_flags = SLAP_MOD_INTERNAL;
-               mod->sml_type.bv_val = NULL;
-               mod->sml_desc = slap_schema.si_ad_entryCSN;
-               mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-               ber_dupbv( &mod->sml_values[0], &csn );
-               mod->sml_values[1].bv_len = 0;
-               mod->sml_values[1].bv_val = NULL;
-               assert( mod->sml_values[0].bv_val != NULL );
-               mod->sml_nvalues = NULL;
-               *modtail = mod;
-               modtail = &mod->sml_next;
-       
-               mod = *modtail;
-               if ( get_manageDIT( op ) ) {
-                       for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
-                               if ( mod->sml_desc == slap_schema.si_ad_modifiersName ) {
-                                       break;
-                               }
-                       }
-               }
-
-               if ( mod == *modtail ) {
+               if ( !gotmname ) {
                        mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-                       mod->sml_op = mop;
+                       mod->sml_op = LDAP_MOD_REPLACE;
                        mod->sml_flags = SLAP_MOD_INTERNAL;
-                       mod->sml_type.bv_val = NULL;
+                       mod->sml_next = NULL;
+                       BER_BVZERO( &mod->sml_type );
                        mod->sml_desc = slap_schema.si_ad_modifiersName;
                        mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
                        ber_dupbv( &mod->sml_values[0], &name );
-                       mod->sml_values[1].bv_len = 0;
-                       mod->sml_values[1].bv_val = NULL;
-                       assert( mod->sml_values[0].bv_val != NULL );
+                       BER_BVZERO( &mod->sml_values[1] );
+                       assert( !BER_BVISNULL( &mod->sml_values[0] ) );
                        mod->sml_nvalues =
                                (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
                        ber_dupbv( &mod->sml_nvalues[0], &nname );
-                       mod->sml_nvalues[1].bv_len = 0;
-                       mod->sml_nvalues[1].bv_val = NULL;
-                       assert( mod->sml_nvalues[0].bv_val != NULL );
+                       BER_BVZERO( &mod->sml_nvalues[1] );
+                       assert( !BER_BVISNULL( &mod->sml_nvalues[0] ) );
                        *modtail = mod;
                        modtail = &mod->sml_next;
                }
 
-               mod = *modtail;
-               if ( get_manageDIT( op ) ) {
-                       for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
-                               if ( mod->sml_desc == slap_schema.si_ad_modifyTimestamp ) {
-                                       break;
-                               }
-                       }
-               }
-
-               if ( mod == *modtail ) {
+               if ( !gotmtime ) {
                        mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-                       mod->sml_op = mop;
+                       mod->sml_op = LDAP_MOD_REPLACE;
                        mod->sml_flags = SLAP_MOD_INTERNAL;
-                       mod->sml_type.bv_val = NULL;
+                       mod->sml_next = NULL;
+                       BER_BVZERO( &mod->sml_type );
                        mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
                        mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
                        ber_dupbv( &mod->sml_values[0], &timestamp );
-                       mod->sml_values[1].bv_len = 0;
-                       mod->sml_values[1].bv_val = NULL;
-                       assert( mod->sml_values[0].bv_val != NULL );
+                       BER_BVZERO( &mod->sml_values[1] );
+                       assert( !BER_BVISNULL( &mod->sml_values[0] ) );
                        mod->sml_nvalues = NULL;
                        *modtail = mod;
                        modtail = &mod->sml_next;
                }
        }
-
-       *modtail = NULL;
-       return LDAP_SUCCESS;
 }