]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/add.c
+ Fixed slapd connectionless LDAP support
[openldap] / servers / slapd / add.c
index fe7c7b607512eee5e72ec9aef2832dd0e51e7aeb..acf2e2f85ecb4b4cb56ce7521eaed42d00bfa39c 100644 (file)
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
 #include "portable.h"
 
 #include <stdio.h>
-
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/socket.h>
 
+#include "lutil.h"
 #include "slap.h"
 
-static int     add_created_attrs(Operation *op, Entry *e);
-
 int
-do_add( Connection *conn, Operation *op )
+do_add( Operation *op, SlapReply *rs )
 {
        BerElement      *ber = op->o_ber;
-       char            *dn, *ndn, *last;
+       char            *last;
+       struct berval   dn = BER_BVNULL;
        ber_len_t       len;
        ber_tag_t       tag;
-       Entry           *e;
-       Backend         *be;
-       int                     rc = LDAP_SUCCESS;
+       Modifications   *modlist = NULL;
+       Modifications   **modtail = &modlist;
+       Modifications   tmp;
+       char            textbuf[ SLAP_TEXT_BUFLEN ];
+       size_t          textlen = sizeof( textbuf );
+       int             rc = 0;
+       int             freevals = 1;
 
        Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
-
-       if( op->o_bind_in_progress ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: 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 add request.  It looks like this:
         *
@@ -55,92 +63,216 @@ do_add( Connection *conn, Operation *op )
         */
 
        /* get the name */
-       if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
+       if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_disconnect( conn, op,
-                       LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
+               send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+               return SLAPD_DISCONNECT;
        }
 
-       ndn = ch_strdup( dn );
+       op->ora_e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
-       if ( dn_normalize_case( ndn ) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 );
-               send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX, NULL,
-                   "invalid DN", NULL, NULL );
-               free( dn );
-               free( ndn );
-               return LDAP_INVALID_DN_SYNTAX;
-       }
+       rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
+               op->o_tmpmemctx );
 
-       e = (Entry *) ch_calloc( 1, sizeof(Entry) );
-
-       e->e_dn = dn;
-       e->e_ndn = ndn;
-       e->e_private = NULL;
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn.bv_val, 0, 0 );
+               send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
+               goto done;
+       }
 
-       dn = NULL;
+       ber_dupbv( &op->ora_e->e_name, &op->o_req_dn );
+       ber_dupbv( &op->ora_e->e_nname, &op->o_req_ndn );
 
-       Debug( LDAP_DEBUG_ARGS, "    do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
+       Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", op->ora_e->e_dn, 0, 0 );
 
        /* get the attrs */
-       e->e_attrs = NULL;
        for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-           tag = ber_next_element( ber, &len, last ) ) {
-               char            *type;
-               struct berval   **vals;
+           tag = ber_next_element( ber, &len, last ) )
+       {
+               Modifications *mod;
+               ber_tag_t rtag;
 
-               if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) {
-                       send_ldap_disconnect( conn, op,
-                               LDAP_PROTOCOL_ERROR, "decoding error" );
-                       entry_free( e );
-                       return -1;
-               }
+               tmp.sml_nvalues = NULL;
 
-               if ( vals == NULL ) {
-                       Debug( LDAP_DEBUG_ANY, "no values for type %s\n", type,
-                           0, 0 );
-                       send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
-                               NULL, "no values for type", NULL, NULL );
-                       free( type );
-                       entry_free( e );
-                       return LDAP_PROTOCOL_ERROR;
+               rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_values );
+
+               if ( rtag == LBER_ERROR ) {
+                       Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
+                       send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+                       rs->sr_err = SLAPD_DISCONNECT;
+                       goto done;
                }
 
-               attr_merge( e, type, vals );
+               if ( tmp.sml_values == NULL ) {
+                       Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
+                               tmp.sml_type.bv_val, 0, 0 );
+                       send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+                               "no values for attribute type" );
+                       goto done;
+               }
 
-               free( type );
-               ber_bvecfree( vals );
+               mod  = (Modifications *) ch_malloc( sizeof(Modifications) );
+               mod->sml_op = LDAP_MOD_ADD;
+               mod->sml_flags = 0;
+               mod->sml_next = NULL;
+               mod->sml_desc = NULL;
+               mod->sml_type = tmp.sml_type;
+               mod->sml_values = tmp.sml_values;
+               mod->sml_nvalues = NULL;
+
+               *modtail = mod;
+               modtail = &mod->sml_next;
        }
 
        if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
-               entry_free( e );
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_disconnect( conn, op,
-                       LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
+               send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+               rs->sr_err = SLAPD_DISCONNECT;
+               goto done;
        }
 
-       if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
-               entry_free( e );
+       if ( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
-               return rc;
+               goto done;
        } 
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d ADD dn=\"%s\"\n",
-           op->o_connid, op->o_opid, e->e_ndn, 0, 0 );
+       if ( modlist == NULL ) {
+               send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+                       "no attributes provided" );
+               goto done;
+       }
+
+       Statslog( LDAP_DEBUG_STATS, "%s ADD dn=\"%s\"\n",
+           op->o_log_prefix, op->ora_e->e_name.bv_val, 0, 0, 0 );
+
+       if ( dn_match( &op->ora_e->e_nname, &slap_empty_bv ) ) {
+               /* protocolError may be a more appropriate error */
+               send_ldap_error( op, rs, LDAP_ALREADY_EXISTS,
+                       "root DSE already exists" );
+               goto done;
+
+       } else if ( dn_match( &op->ora_e->e_nname, &frontendDB->be_schemandn ) ) {
+               send_ldap_error( op, rs, LDAP_ALREADY_EXISTS,
+                       "subschema subentry already exists" );
+               goto done;
+       }
+
+       rs->sr_err = slap_mods_check( modlist, &rs->sr_text,
+               textbuf, textlen, NULL );
+
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               send_ldap_result( op, rs );
+               goto done;
+       }
+
+       /* temporary; remove if not invoking backend function */
+       op->ora_modlist = modlist;
+
+       /* call this so global overlays/SLAPI have access to ora_e */
+       rs->sr_err = slap_mods2entry( op->ora_modlist, &op->ora_e,
+               1, 0, &rs->sr_text, textbuf, textlen );
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               send_ldap_result( op, rs );
+               goto done;
+       }
+
+       freevals = 0;
+
+       op->o_bd = frontendDB;
+       rc = frontendDB->be_add( op, rs );
+       if ( rc == 0 ) {
+               if ( op->ora_e != NULL && op->o_private != NULL ) {
+                       BackendDB       *bd = op->o_bd;
+
+                       op->o_bd = (BackendDB *)op->o_private;
+                       op->o_private = NULL;
+
+                       be_entry_release_w( op, op->ora_e );
+
+                       op->ora_e = NULL;
+                       op->o_bd = bd;
+                       op->o_private = NULL;
+               }
+       }
+
+done:;
+       if ( modlist != NULL ) {
+               /* in case of error, free the values as well */
+               slap_mods_free( modlist, freevals );
+       }
+
+       if ( op->ora_e != NULL ) {
+               entry_free( op->ora_e );
+       }
+       op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+       op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+
+       return rc;
+}
+
+int
+fe_op_add( Operation *op, SlapReply *rs )
+{
+       int             manageDSAit;
+       Modifications   *modlist = op->ora_modlist;
+       Modifications   **modtail = &modlist;
+       int             rc = 0;
+       BackendDB *op_be, *bd = op->o_bd;
+       char            textbuf[ SLAP_TEXT_BUFLEN ];
+       size_t          textlen = sizeof( textbuf );
+
+       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.
         */
-       be = select_backend( e->e_ndn );
-       if ( be == NULL ) {
-               entry_free( e );
-               send_ldap_result( conn, op, LDAP_REFERRAL, NULL,
-                   NULL, default_referral, NULL );
-               return rc;
+       op->o_bd = select_backend( &op->ora_e->e_nname, manageDSAit, 1 );
+       if ( op->o_bd == NULL ) {
+               op->o_bd = bd;
+               rs->sr_ref = referral_rewrite( default_referral,
+                       NULL, &op->ora_e->e_name, LDAP_SCOPE_DEFAULT );
+               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 != 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 done;
+       }
+
+       /* If we've got a glued backend, check the real backend */
+       op_be = op->o_bd;
+       if ( SLAP_GLUE_INSTANCE( op->o_bd )) {
+               op->o_bd = select_backend( &op->ora_e->e_nname, manageDSAit, 0 );
+       }
+
+       /* check restrictions */
+       if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
+               send_ldap_result( op, rs );
+               goto done;
+       }
+
+       /* check for referrals */
+       if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
+               goto done;
+       }
+
+       rs->sr_err = slap_mods_obsolete_check( op, modlist,
+               &rs->sr_text, textbuf, textlen );
+
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               send_ldap_result( op, rs );
+               goto done;
        }
 
        /*
@@ -149,90 +281,469 @@ do_add( Connection *conn, Operation *op )
         * 2) this backend is master for what it holds;
         * 3) it's a replica and the dn supplied is the updatedn.
         */
-       if ( be->be_add ) {
+       if ( op->o_bd->be_add ) {
                /* do the update here */
-               if ( be->be_update_ndn == NULL ||
-                       strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+               int repl_user = be_isupdate( op );
+#ifndef SLAPD_MULTIMASTER
+               if ( !SLAP_SHADOW(op->o_bd) || repl_user )
+#endif
                {
-                       if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
-                               global_lastmod == ON)) && be->be_update_ndn == NULL )
-                       {
-                               rc = add_created_attrs( op, e );
-
-                               if( rc != LDAP_SUCCESS ) {
-                                       entry_free( e );
-                                       send_ldap_result( conn, op, rc,
-                                               NULL, "no-user-modification attribute type",
-                                               NULL, NULL );
-                                       return rc;
+                       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_text, textbuf, textlen );
+
+                               if ( rs->sr_err != LDAP_SUCCESS ) {
+                                       send_ldap_result( op, rs );
+                                       goto done;
                                }
                        }
 
-                       if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
-                               replog( be, op, e->e_dn, e );
-                               be_entry_release_w( be, e );
+                       if ( !repl_user ) {
+                               /* go to the last mod */
+                               for ( modtail = &modlist;
+                                               *modtail != NULL;
+                                               modtail = &(*modtail)->sml_next )
+                               {
+                                       assert( (*modtail)->sml_op == LDAP_MOD_ADD );
+                                       assert( (*modtail)->sml_desc != NULL );
+                               }
+
+
+                               /* check for duplicate values */
+                               rs->sr_err = slap_mods_no_repl_user_mod_check( op,
+                                       modlist, &rs->sr_text, textbuf, textlen );
+                               if ( rs->sr_err != LDAP_SUCCESS ) {
+                                       send_ldap_result( op, rs );
+                                       goto done;
+                               }
+
+                               rs->sr_err = slap_mods2entry( *modtail, &op->ora_e,
+                                       0, 0, &rs->sr_text, textbuf, textlen );
+                               if ( rs->sr_err != LDAP_SUCCESS ) {
+                                       send_ldap_result( op, rs );
+                                       goto done;
+                               }
+                       }
+
+#ifdef SLAPD_MULTIMASTER
+                       if ( !repl_user )
+#endif
+                       {
+                               cb.sc_next = op->o_callback;
+                               op->o_callback = &cb;
+                       }
+                       rc = op->o_bd->be_add( op, rs );
+                       if ( rc == LDAP_SUCCESS ) {
+                               /* NOTE: be_entry_release_w() is
+                                * called by do_add(), so that global
+                                * overlays on the way back can
+                                * at least read the entry */
+                               op->o_private = op->o_bd;
                        }
 
+#ifndef SLAPD_MULTIMASTER
                } else {
-                       entry_free( e );
-                       send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
-                               be->be_update_refs ? be->be_update_refs : default_referral, NULL );
+                       BerVarray defref = NULL;
+
+                       defref = op->o_bd->be_update_refs
+                               ? op->o_bd->be_update_refs : default_referral;
+
+                       if ( defref != NULL ) {
+                               rs->sr_ref = referral_rewrite( defref,
+                                       NULL, &op->ora_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 = default_referral;
+                               send_ldap_result( op, rs );
+
+                               if ( rs->sr_ref != default_referral ) {
+                                       ber_bvarray_free( rs->sr_ref );
+                               }
+                       } else {
+                               send_ldap_error( op, rs,
+                                       LDAP_UNWILLING_TO_PERFORM,
+                                       "shadow context; no update referral" );
+                       }
+#endif /* SLAPD_MULTIMASTER */
                }
        } else {
-           Debug( LDAP_DEBUG_ARGS, "    do_add: HHH\n", 0, 0, 0 );
-               entry_free( e );
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "Function not implemented", NULL, NULL );
+           Debug( LDAP_DEBUG_ARGS, "    do_add: no backend support\n", 0, 0, 0 );
+           send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                       "operation not supported within namingContext" );
        }
 
+done:;
+       op->o_bd = bd;
        return rc;
 }
 
-static int
-add_created_attrs( Operation *op, Entry *e )
+int
+slap_mods2entry(
+       Modifications *mods,
+       Entry **e,
+       int initial,
+       int dup,
+       const char **text,
+       char *textbuf, size_t textlen )
 {
-       char            buf[22];
-       struct berval   bv;
-       struct berval   *bvals[2];
-       Attribute       *a;
-       struct tm       *ltm;
-       time_t          currenttime;
+       Attribute **tail;
+
+       if ( initial ) {
+               assert( (*e)->e_attrs == NULL );
+       }
+
+       for ( tail = &(*e)->e_attrs; *tail != NULL; tail = &(*tail)->a_next )
+               ;
+
+       *text = textbuf;
 
-       Debug( LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0 );
+       for( ; mods != NULL; mods = mods->sml_next ) {
+               Attribute *attr;
 
-       bvals[0] = &bv;
-       bvals[1] = NULL;
+               assert( mods->sml_desc != NULL );
 
-       /* return error on any attempts by the user to add these attrs */
-       for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-               if ( oc_check_no_usermod_attr( a->a_type ) ) {
-                       return LDAP_CONSTRAINT_VIOLATION;
+               attr = attr_find( (*e)->e_attrs, mods->sml_desc );
+
+               if( attr != NULL ) {
+#define SLURPD_FRIENDLY
+#ifdef SLURPD_FRIENDLY
+                       ber_len_t i,j;
+
+                       if ( !initial ) {
+                               /*      
+                                * This check allows overlays to override operational
+                                * attributes by setting them directly in the entry.
+                                * We assume slap_mods_no_user_mod_check() was called
+                                * with the user modifications.
+                                */
+                               *text = NULL;
+                               return LDAP_SUCCESS;
+                       }
+
+                       for( i=0; attr->a_vals[i].bv_val; i++ ) {
+                               /* count them */
+                       }
+                       for( j=0; mods->sml_values[j].bv_val; j++ ) {
+                               /* count them */
+                       }
+                       j++;    /* NULL */
+                       
+                       attr->a_vals = ch_realloc( attr->a_vals,
+                               sizeof( struct berval ) * (i+j) );
+
+                       /* should check for duplicates */
+
+                       if ( dup ) {
+                               for ( j = 0; mods->sml_values[j].bv_val; j++ ) {
+                                       ber_dupbv( &attr->a_vals[i+j], &mods->sml_values[j] );
+                               }
+                               BER_BVZERO( &attr->a_vals[i+j] );
+                               j++;
+                       } else {
+                               AC_MEMCPY( &attr->a_vals[i], mods->sml_values,
+                                       sizeof( struct berval ) * j );
+                       }
+
+                       if( mods->sml_nvalues ) {
+                               attr->a_nvals = ch_realloc( attr->a_nvals,
+                                       sizeof( struct berval ) * (i+j) );
+                               if ( dup ) {
+                                       for ( j = 0; mods->sml_nvalues[j].bv_val; j++ ) {
+                                               ber_dupbv( &attr->a_nvals[i+j], &mods->sml_nvalues[j] );
+                                       }
+                                       BER_BVZERO( &attr->a_nvals[i+j] );      
+                               } else {
+                                       AC_MEMCPY( &attr->a_nvals[i], mods->sml_nvalues,
+                                               sizeof( struct berval ) * j );
+                               }
+                       } else {
+                               attr->a_nvals = attr->a_vals;
+                       }
+
+                       continue;
+#else
+                       snprintf( textbuf, textlen,
+                               "attribute '%s' provided more than once",
+                               mods->sml_desc->ad_cname.bv_val );
+                       *text = textbuf;
+                       return LDAP_TYPE_OR_VALUE_EXISTS;
+#endif
                }
+
+               if( mods->sml_values[1].bv_val != NULL ) {
+                       /* check for duplicates */
+                       int             i, j, rc, match;
+                       MatchingRule *mr = mods->sml_desc->ad_type->sat_equality;
+
+                       for ( i = 1; mods->sml_values[i].bv_val != NULL; i++ ) {
+                               /* test asserted values against themselves */
+                               for( j = 0; j < i; j++ ) {
+                                       rc = ordered_value_match( &match, mods->sml_desc, mr,
+                                               SLAP_MR_EQUALITY
+                                               | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX
+                                               | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
+                                               | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
+                                               mods->sml_nvalues
+                                                       ? &mods->sml_nvalues[i]
+                                                       : &mods->sml_values[i],
+                                               mods->sml_nvalues
+                                                       ? &mods->sml_nvalues[j]
+                                                       : &mods->sml_values[j],
+                                               text );
+
+                                       if ( rc == LDAP_SUCCESS && match == 0 ) {
+                                               /* value exists already */
+                                               snprintf( textbuf, textlen,
+                                                       "%s: value #%d provided more than once",
+                                                       mods->sml_desc->ad_cname.bv_val, j );
+                                               *text = textbuf;
+                                               return LDAP_TYPE_OR_VALUE_EXISTS;
+
+                                       } else if ( rc != LDAP_SUCCESS ) {
+                                               return rc;
+                                       }
+                               }
+                       }
+               }
+
+               attr = ch_calloc( 1, sizeof(Attribute) );
+
+               /* move ad to attr structure */
+               attr->a_desc = mods->sml_desc;
+
+               /* move values to attr structure */
+               /*      should check for duplicates */
+               if ( dup ) { 
+                       int i;
+                       for ( i = 0; mods->sml_values[i].bv_val; i++ ) /* EMPTY */;
+                       attr->a_vals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
+                       for ( i = 0; mods->sml_values[i].bv_val; i++ ) {
+                               ber_dupbv( &attr->a_vals[i], &mods->sml_values[i] );
+                       }
+                       BER_BVZERO( &attr->a_vals[i] );
+               } else {
+                       attr->a_vals = mods->sml_values;
+               }
+
+               if ( mods->sml_nvalues ) {
+                       if ( dup ) {
+                               int i;
+                               for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) /* EMPTY */;
+                               attr->a_nvals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
+                               for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) {
+                                       ber_dupbv( &attr->a_nvals[i], &mods->sml_nvalues[i] );
+                               }
+                               BER_BVZERO( &attr->a_nvals[i] );
+                       } else {
+                               attr->a_nvals = mods->sml_nvalues;
+                       }
+               } else {
+                       attr->a_nvals = attr->a_vals;
+               }
+
+               *tail = attr;
+               tail = &attr->a_next;
        }
 
-       if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
-               bv.bv_val = "<anonymous>";
-               bv.bv_len = strlen( bv.bv_val );
-       } else {
-               bv.bv_val = op->o_dn;
-               bv.bv_len = strlen( bv.bv_val );
+       *text = NULL;
+
+       return LDAP_SUCCESS;
+}
+
+int
+slap_entry2mods(
+       Entry *e,
+       Modifications **mods,
+       const char **text,
+       char *textbuf, size_t textlen )
+{
+       Modifications   *modhead = NULL;
+       Modifications   *mod;
+       Modifications   **modtail = &modhead;
+       Attribute               *a_new;
+       AttributeDescription    *a_new_desc;
+       int                             i, count;
+
+       a_new = e->e_attrs;
+
+       while ( a_new != NULL ) {
+               a_new_desc = a_new->a_desc;
+               mod = (Modifications *) malloc( sizeof( Modifications ));
+               
+               mod->sml_op = LDAP_MOD_REPLACE;
+               mod->sml_flags = 0;
+
+               mod->sml_type = a_new_desc->ad_cname;
+
+               for ( count = 0; a_new->a_vals[count].bv_val; count++ ) /* EMPTY */;
+
+               mod->sml_values = (struct berval*) malloc(
+                       (count+1) * sizeof( struct berval) );
+
+               /* see slap_mods_check() comments...
+                * if a_vals == a_nvals, there is no normalizer.
+                * in this case, mod->sml_nvalues must be left NULL.
+                */
+               if ( a_new->a_vals != a_new->a_nvals ) {
+                       mod->sml_nvalues = (struct berval*) malloc(
+                               (count+1) * sizeof( struct berval) );
+               } else {
+                       mod->sml_nvalues = NULL;
+               }
+
+               for ( i = 0; i < count; i++ ) {
+                       ber_dupbv(mod->sml_values+i, a_new->a_vals+i); 
+                       if ( mod->sml_nvalues ) {
+                               ber_dupbv( mod->sml_nvalues+i, a_new->a_nvals+i ); 
+                       } 
+               }
+
+               mod->sml_values[count].bv_val = NULL; 
+               mod->sml_values[count].bv_len = 0; 
+
+               if ( mod->sml_nvalues ) {
+                       mod->sml_nvalues[count].bv_val = NULL; 
+                       mod->sml_nvalues[count].bv_len = 0; 
+               }
+
+               mod->sml_desc = a_new_desc;
+               mod->sml_next =NULL;
+               *modtail = mod;
+               modtail = &mod->sml_next;
+               a_new = a_new->a_next; 
        }
-       attr_merge( e, "creatorsname", bvals );
 
-       currenttime = slap_get_time();
-       ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-#ifndef LDAP_LOCALTIME
-       ltm = gmtime( &currenttime );
-       strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
-#else
-       ltm = localtime( &currenttime );
-       strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
-#endif
-       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+       *mods = modhead;
+
+       return LDAP_SUCCESS;
+}
 
-       bv.bv_val = buf;
-       bv.bv_len = strlen( bv.bv_val );
-       attr_merge( e, "createtimestamp", bvals );
+int slap_add_opattrs(
+       Operation *op,
+       const char **text,
+       char *textbuf,
+       size_t textlen,
+       int manage_ctxcsn )
+{
+       struct berval name, timestamp, csn = BER_BVNULL;
+       struct berval nname, tmp;
+       char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+       char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
+       Attribute *a;
+
+       a = attr_find( op->ora_e->e_attrs,
+               slap_schema.si_ad_structuralObjectClass );
+
+       if ( !a ) {
+               Attribute *oc;
+               int rc;
+
+               oc = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_objectClass );
+               if ( oc ) {
+                       rc = structural_class( oc->a_vals, &tmp, NULL, text,
+                               textbuf, textlen );
+                       if( rc != LDAP_SUCCESS ) return rc;
+
+                       attr_merge_one( op->ora_e, slap_schema.si_ad_structuralObjectClass,
+                               &tmp, NULL );
+               }
+       }
+
+       if ( SLAP_LASTMOD( op->o_bd ) ) {
+               char *ptr;
+               int gotcsn = 0;
+               timestamp.bv_val = timebuf;
+
+               a = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_entryCSN );
+               if ( a ) {
+                       gotcsn = 1;
+                       csn = a->a_vals[0];
+               }
+               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;
+                       strncpy( 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 );
+               }
+
+               if ( BER_BVISEMPTY( &op->o_dn ) ) {
+                       BER_BVSTR( &name, SLAPD_ANONYMOUS );
+                       nname = name;
+               } else {
+                       name = op->o_dn;
+                       nname = op->o_ndn;
+               }
+
+               a = attr_find( op->ora_e->e_attrs,
+                       slap_schema.si_ad_entryUUID );
+               if ( !a ) {
+                       char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
+
+                       tmp.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
+                       tmp.bv_val = uuidbuf;
+                       
+                       attr_merge_normalize_one( op->ora_e,
+                               slap_schema.si_ad_entryUUID, &tmp, op->o_tmpmemctx );
+               }
+
+               a = attr_find( op->ora_e->e_attrs,
+                       slap_schema.si_ad_creatorsName );
+               if ( !a ) {
+                       attr_merge_one( op->ora_e,
+                               slap_schema.si_ad_creatorsName, &name, &nname );
+               }
+
+               a = attr_find( op->ora_e->e_attrs,
+                       slap_schema.si_ad_createTimestamp );
+               if ( !a ) {
+                       attr_merge_one( op->ora_e,
+                               slap_schema.si_ad_createTimestamp, &timestamp, NULL );
+               }
+
+               if ( !gotcsn ) {
+                       attr_merge_one( op->ora_e,
+                               slap_schema.si_ad_entryCSN, &csn, NULL );
+               }
+
+               a = attr_find( op->ora_e->e_attrs,
+                       slap_schema.si_ad_modifiersName );
+               if ( !a ) {
+                       attr_merge_one( op->ora_e,
+                               slap_schema.si_ad_modifiersName, &name, &nname );
+               }
+
+               a = attr_find( op->ora_e->e_attrs,
+                       slap_schema.si_ad_modifyTimestamp );
+               if ( !a ) {
+                       attr_merge_one( op->ora_e,
+                               slap_schema.si_ad_modifyTimestamp, &timestamp, NULL );
+               }
+
+       }
        return LDAP_SUCCESS;
 }