]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/modify.c
ITS#5379 HAVE_TLS dependency
[openldap] / servers / slapd / modify.c
index 4832d8dc8d18b382100f814e8fd1ccfcb21f1b5c..be604ea2d61bc66bc21421b588073724ee36f937 100644 (file)
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 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>.
  */
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
 #include <ac/string.h>
 #include <ac/time.h>
 
+#include "slap.h"
 #include "lutil.h"
 
-#include "ldap_pvt.h"
-#include "slap.h"
 
 int
 do_modify(
-    Connection *conn,
-    Operation  *op )
+    Operation  *op,
+    SlapReply  *rs )
 {
-       struct berval dn = { 0, NULL };
-       struct berval *pdn = NULL;
-       struct berval *ndn = NULL;
-       char            *last;
-       ber_tag_t       tag;
-       ber_len_t       len;
-       LDAPModList     *modlist = NULL;
-       LDAPModList     **modtail = &modlist;
+       struct berval dn = BER_BVNULL;
+       char            textbuf[ SLAP_TEXT_BUFLEN ];
+       size_t          textlen = sizeof( textbuf );
 #ifdef LDAP_DEBUG
-       LDAPModList *tmp;
-#endif
-       Modifications *mods = NULL;
-       Backend         *be;
-       int rc;
-       const char      *text;
-       int manageDSAit;
-
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-               "do_modify: enter\n" ));
-#else
-       Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
+       Modifications   *tmp;
 #endif
 
+       Debug( LDAP_DEBUG_TRACE, "%s do_modify\n",
+               op->o_log_prefix, 0, 0 );
        /*
         * Parse the modify request.  It looks like this:
         *
@@ -76,254 +68,207 @@ do_modify(
         *      }
         */
 
-       if ( ber_scanf( op->o_ber, "{o" /*}*/, &dn ) == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_modify: ber_scanf failed\n" ));
-#else
-               Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 );
-#endif
-
-               send_ldap_disconnect( conn, op,
-                       LDAP_PROTOCOL_ERROR, "decoding error" );
+       if ( ber_scanf( op->o_ber, "{m" /*}*/, &dn ) == LBER_ERROR ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_modify: ber_scanf failed\n",
+                       op->o_log_prefix, 0, 0 );
+               send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                return SLAPD_DISCONNECT;
        }
 
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-                  "do_modify: dn (%s)\n", dn.bv_val ));
-#else
-       Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn.bv_val, 0, 0 );
-#endif
-
-
-       /* collect modifications & save for later */
-
-       for ( tag = ber_first_element( op->o_ber, &len, &last );
-           tag != LBER_DEFAULT;
-           tag = ber_next_element( op->o_ber, &len, last ) )
-       {
-               ber_int_t mop;
-
-               (*modtail) = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
-
-               if ( ber_scanf( op->o_ber, "{i{a[V]}}", &mop,
-                   &(*modtail)->ml_type, &(*modtail)->ml_bvalues )
-                   == LBER_ERROR )
-               {
-                       send_ldap_disconnect( conn, op,
-                               LDAP_PROTOCOL_ERROR, "decoding modlist error" );
-                       rc = SLAPD_DISCONNECT;
-                       goto cleanup;
-               }
-
-               switch( mop ) {
-               case LDAP_MOD_ADD:
-                       if ( (*modtail)->ml_bvalues == NULL ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                                       "do_modify: modify/add operation (%ld) requires values\n",
-                                       (long)mop ));
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "do_modify: modify/add operation (%ld) requires values\n",
-                                       (long) mop, 0, 0 );
-#endif
-
-                               send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
-                                       NULL, "modify/add operation requires values",
-                                       NULL, NULL );
-                               rc = LDAP_PROTOCOL_ERROR;
-                               goto cleanup;
-                       }
-
-                       /* fall through */
-
-               case LDAP_MOD_DELETE:
-               case LDAP_MOD_REPLACE:
-                       break;
-
-               default: {
-#ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                                       "do_modify: invalid modify operation (%ld)\n",
-                                       (long)mop ));
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "do_modify: invalid modify operation (%ld)\n",
-                                       (long) mop, 0, 0 );
-#endif
-
-                               send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
-                                       NULL, "unrecognized modify operation", NULL, NULL );
-                               rc = LDAP_PROTOCOL_ERROR;
-                               goto cleanup;
-                       }
-               }
-
-               (*modtail)->ml_op = mop;
-               modtail = &(*modtail)->ml_next;
-       }
-       *modtail = NULL;
-
-       if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_modify: get_ctrls failed\n" ));
-#else
-               Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );
-#endif
+       Debug( LDAP_DEBUG_ARGS, "%s do_modify: dn (%s)\n",
+               op->o_log_prefix, dn.bv_val, 0 );
 
+       rs->sr_err = slap_parse_modlist( op, rs, op->o_ber, &op->oq_modify );
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_modify: slap_parse_modlist failed err=%d msg=%s\n",
+                       op->o_log_prefix, rs->sr_err, rs->sr_text );
                goto cleanup;
        }
 
-       rc = dnPretty( NULL, &dn, &pdn );
-       if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_modify: conn %d  invalid dn (%s)\n",
-                       conn->c_connid, dn.bv_val ));
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "do_modify: 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 );
+       if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_modify: get_ctrls failed\n",
+                       op->o_log_prefix, 0, 0 );
                goto cleanup;
        }
 
-       rc = dnNormalize( NULL, &dn, &ndn );
-       if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_modify: conn %d  invalid dn (%s)\n",
-                       conn->c_connid, dn.bv_val ));
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "do_modify: 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 );
+       rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
+               op->o_tmpmemctx );
+       if( rs->sr_err != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_modify: invalid dn (%s)\n",
+                       op->o_log_prefix, dn.bv_val, 0 );
+               send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
                goto cleanup;
        }
 
-       if( ndn->bv_len == 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_modify: attempt to modify root DSE.\n" ));
-#else
-               Debug( LDAP_DEBUG_ANY, "do_modify: root dse!\n", 0, 0, 0 );
-#endif
-
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "modify upon the root DSE not supported", NULL, NULL );
-               goto cleanup;
-
-#if defined( SLAPD_SCHEMA_DN )
-       } else if ( strcasecmp( ndn->bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_modify: attempt to modify subschema subentry.\n" ));
-#else
-               Debug( LDAP_DEBUG_ANY, "do_modify: subschema subentry!\n", 0, 0, 0 );
-#endif
-
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "modification of subschema subentry not supported",
-                       NULL, NULL );
-               goto cleanup;
-#endif
-       }
+       op->orm_no_opattrs = 0;
 
 #ifdef LDAP_DEBUG
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-               "do_modify: modifications:\n" ));
-#else
-       Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
-#endif
-
-       for ( tmp = modlist; tmp != NULL; tmp = tmp->ml_next ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                       "\t%s:  %s\n", tmp->ml_op == LDAP_MOD_ADD ?
-                               "add" : (tmp->ml_op == LDAP_MOD_DELETE ?
-                                       "delete" : "replace"), tmp->ml_type ));
-
-               if ( tmp->ml_bvalues == NULL ) {
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                          "\t\tno values" ));
-               } else if ( tmp->ml_bvalues[0] == NULL ) {
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                          "\t\tzero values" ));
-               } else if ( tmp->ml_bvalues[1] == NULL ) {
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                          "\t\tone value" ));
-               } else {
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                          "\t\tmultiple values" ));
-               }
+       Debug( LDAP_DEBUG_ARGS, "%s modifications:\n",
+                       op->o_log_prefix, 0, 0 );
 
-#else
+       for ( tmp = op->orm_modlist; tmp != NULL; tmp = tmp->sml_next ) {
                Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n",
-                       tmp->ml_op == LDAP_MOD_ADD
-                               ? "add" : (tmp->ml_op == LDAP_MOD_DELETE
-                                       ? "delete" : "replace"), tmp->ml_type, 0 );
+                       tmp->sml_op == LDAP_MOD_ADD ? "add" :
+                               (tmp->sml_op == LDAP_MOD_INCREMENT ? "increment" :
+                               (tmp->sml_op == LDAP_MOD_DELETE ? "delete" :
+                                       "replace")), tmp->sml_type.bv_val, 0 );
 
-               if ( tmp->ml_bvalues == NULL ) {
+               if ( tmp->sml_values == NULL ) {
                        Debug( LDAP_DEBUG_ARGS, "%s\n",
                           "\t\tno values", NULL, NULL );
-               } else if ( tmp->ml_bvalues[0] == NULL ) {
+               } else if ( BER_BVISNULL( &tmp->sml_values[ 0 ] ) ) {
                        Debug( LDAP_DEBUG_ARGS, "%s\n",
                           "\t\tzero values", NULL, NULL );
-               } else if ( tmp->ml_bvalues[1] == NULL ) {
+               } else if ( BER_BVISNULL( &tmp->sml_values[ 1 ] ) ) {
                        Debug( LDAP_DEBUG_ARGS, "%s, length %ld\n",
-                          "\t\tone value", (long) tmp->ml_bvalues[0]->bv_len, NULL );
+                          "\t\tone value", (long) tmp->sml_values[0].bv_len, NULL );
                } else {
                        Debug( LDAP_DEBUG_ARGS, "%s\n",
                           "\t\tmultiple values", NULL, NULL );
                }
-#endif
+       }
+
+       if ( StatslogTest( LDAP_DEBUG_STATS ) ) {
+               char abuf[BUFSIZ/2], *ptr = abuf;
+               int len = 0;
+
+               Statslog( LDAP_DEBUG_STATS, "%s MOD dn=\"%s\"\n",
+                       op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
+
+               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;
+                               ptr = abuf;
+
+                               if( 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
+                                       Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
+                                               op->o_log_prefix, tmp->sml_type.bv_val, 0, 0, 0 );
+                                       continue;
+                               }
+                       }
+                       if (len) {
+                               *ptr++ = ' ';
+                               len++;
+                       }
+                       ptr = lutil_strcopy(ptr, tmp->sml_type.bv_val);
+                       len += tmp->sml_type.bv_len;
+               }
+               if (len) {
+                       Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
+                               op->o_log_prefix, abuf, 0, 0, 0 );
+               }
+       }
+#endif /* LDAP_DEBUG */
+
+       rs->sr_err = slap_mods_check( op, op->orm_modlist,
+               &rs->sr_text, textbuf, textlen, NULL );
+
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               send_ldap_result( op, rs );
+               goto cleanup;
+       }
+
+       op->o_bd = frontendDB;
+       rs->sr_err = frontendDB->be_modify( op, rs );
+
+#ifdef LDAP_X_TXN
+       if( rs->sr_err == LDAP_X_TXN_SPECIFY_OKAY ) {
+               /* skip cleanup */
+               return rs->sr_err;
        }
 #endif
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MOD dn=\"%s\"\n",
-           op->o_connid, op->o_opid, dn.bv_val, 0, 0 );
+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 );
+
+       return rs->sr_err;
+}
 
-       manageDSAit = get_manageDSAit( op );
+int
+fe_op_modify( Operation *op, SlapReply *rs )
+{
+       BackendDB       *op_be, *bd = op->o_bd;
+       char            textbuf[ SLAP_TEXT_BUFLEN ];
+       size_t          textlen = sizeof( textbuf );
+       
+       if ( BER_BVISEMPTY( &op->o_req_ndn ) ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_modify: root dse!\n",
+                       op->o_log_prefix, 0, 0 );
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                       "modify upon the root DSE not supported" );
+               goto cleanup;
+
+       } else if ( bvmatch( &op->o_req_ndn, &frontendDB->be_schemandn ) ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_modify: subschema subentry!\n",
+                       op->o_log_prefix, 0, 0 );
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                       "modification of subschema subentry not supported" );
+               goto cleanup;
+       }
 
        /*
         * 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->bv_val, manageDSAit, 0 )) == NULL ) {
-               struct berval **ref = referral_rewrite( default_referral,
-                       NULL, pdn->bv_val, LDAP_SCOPE_DEFAULT );
+       op->o_bd = select_backend( &op->o_req_ndn, 1 );
+       if ( op->o_bd == NULL ) {
+               op->o_bd = bd;
+               rs->sr_ref = referral_rewrite( default_referral,
+                       NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
+               if ( !rs->sr_ref ) {
+                       rs->sr_ref = default_referral;
+               }
+
+               if ( rs->sr_ref != NULL ) {
+                       rs->sr_err = LDAP_REFERRAL;
+                       send_ldap_result( op, rs );
 
-               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                       NULL, NULL, ref ? ref : default_referral, NULL );
+                       if ( rs->sr_ref != default_referral ) {
+                               ber_bvarray_free( rs->sr_ref );
+                       }
 
-               ber_bvecfree( ref );
+               } else {
+                       send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                               "no global superior knowledge" );
+               }
                goto cleanup;
        }
 
+       /* 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->o_req_ndn, 0 );
+       }
+
        /* 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 );
+       if ( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
+               send_ldap_result( op, rs );
                goto cleanup;
        }
 
        /* check for referrals */
-       rc = backend_check_referrals( be, conn, op, pdn->bv_val, ndn->bv_val );
-       if ( rc != LDAP_SUCCESS ) {
+       if ( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
                goto cleanup;
        }
 
-       /* deref suffix alias if appropriate */
-       suffix_alias( be, ndn );
+       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 );
+               goto cleanup;
+       }
+
+       /* check for modify/increment support */
+       if ( op->orm_increment && !SLAP_INCREMENT( op->o_bd ) ) {
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                       "modify/increment not supported in context" );
+       }
 
        /*
         * do the modify if 1 && (2 || 3)
@@ -331,138 +276,213 @@ do_modify(
         * 2) this backend is master for what it holds;
         * 3) it's a replica and the dn supplied is the update_ndn.
         */
-       if ( be->be_modify ) {
+       if ( op->o_bd->be_modify ) {
                /* do the update here */
-               int repl_user = be_isupdate( be, &op->o_ndn );
-#ifndef SLAPD_MULTIMASTER
-               /* Multimaster slapd does not have to check for replicator dn
+               int repl_user = be_isupdate( op );
+
+               /*
+                * Multimaster slapd does not have to check for replicator dn
                 * because it accepts each modify request
                 */
-               if ( !be->be_update_ndn.bv_len || repl_user )
-#endif
-               {
-                       int update = be->be_update_ndn.bv_len;
-                       const char *text;
-                       char textbuf[SLAP_TEXT_BUFLEN];
-                       size_t textlen = sizeof textbuf;
+               if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user ) {
+                       int update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn );
 
-                       rc = slap_modlist2mods( modlist, update, &mods, &text,
-                               textbuf, textlen );
+                       op->o_bd = op_be;
 
-                       if( rc != LDAP_SUCCESS ) {
-                               send_ldap_result( conn, op, rc,
-                                       NULL, text, NULL, NULL );
-                               goto cleanup;
+                       if ( !update ) {
+                               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 );
+                                       goto cleanup;
+                               }
                        }
-
-                       if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
-                               global_lastmod == ON)) && !repl_user )
-                       {
-                               Modifications **modstail;
-                               for( modstail = &mods;
-                                       *modstail != NULL;
-                                       modstail = &(*modstail)->sml_next )
-                               {
-                                       /* empty */
+                       op->o_bd->be_modify( op, rs );
+
+               } else { /* send a referral */
+                       BerVarray 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->o_req_dn,
+                                       LDAP_SCOPE_DEFAULT );
+                               if ( rs->sr_ref == NULL ) {
+                                       /* FIXME: must duplicate, because
+                                        * overlays may muck with it */
+                                       rs->sr_ref = defref;
                                }
-
-                               rc = slap_mods_opattrs( op, mods, modstail, &text,
-                                       textbuf, textlen );
-                               if( rc != LDAP_SUCCESS ) {
-                                       send_ldap_result( conn, op, rc,
-                                               NULL, text,
-                                               NULL, NULL );
-                                       goto cleanup;
+                               rs->sr_err = LDAP_REFERRAL;
+                               send_ldap_result( op, rs );
+                               if ( rs->sr_ref != defref ) {
+                                       ber_bvarray_free( rs->sr_ref );
                                }
+
+                       } else {
+                               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                                       "shadow context; no update referral" );
                        }
+               }
 
-                       if ( (*be->be_modify)( be, conn, op, pdn->bv_val, ndn->bv_val, mods ) == 0
-#ifdef SLAPD_MULTIMASTER
-                               && !repl_user
-#endif
-                       ) {
-                               /* but we log only the ones not from a replicator user */
-                               replog( be, op, pdn->bv_val, ndn->bv_val, mods );
+       } else {
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                   "operation not supported within namingContext" );
+       }
+
+cleanup:;
+       op->o_bd = bd;
+       return rs->sr_err;
+}
+
+/*
+ * Obsolete constraint checking.
+ */
+int
+slap_mods_obsolete_check(
+       Operation *op,
+       Modifications *ml,
+       const char **text,
+       char *textbuf,
+       size_t textlen )
+{
+       if( get_relax( op ) ) return LDAP_SUCCESS;
+
+       for ( ; ml != NULL; ml = ml->sml_next ) {
+               if ( is_at_obsolete( ml->sml_desc->ad_type ) &&
+                       (( ml->sml_op != LDAP_MOD_REPLACE &&
+                               ml->sml_op != LDAP_MOD_DELETE ) ||
+                                       ml->sml_values != NULL ))
+               {
+                       /*
+                        * attribute is obsolete,
+                        * only allow replace/delete with no values
+                        */
+                       snprintf( textbuf, textlen,
+                               "%s: attribute is obsolete",
+                               ml->sml_type.bv_val );
+                       *text = textbuf;
+                       return LDAP_CONSTRAINT_VIOLATION;
+               }
+       }
+
+       return LDAP_SUCCESS;
+}
+
+/*
+ * No-user-modification constraint checking.
+ */
+int
+slap_mods_no_user_mod_check(
+       Operation *op,
+       Modifications *ml,
+       const char **text,
+       char *textbuf,
+       size_t textlen )
+{
+       for ( ; ml != NULL; ml = ml->sml_next ) {
+               if ( !is_at_no_user_mod( ml->sml_desc->ad_type ) ) {
+                       continue;
+               }
+
+               if ( ml->sml_flags & SLAP_MOD_INTERNAL ) {
+                       continue;
+               }
+
+               if ( get_relax( op ) ) {
+                       if ( ml->sml_desc->ad_type->sat_flags & SLAP_AT_MANAGEABLE ) {
+                               ml->sml_flags |= SLAP_MOD_MANAGING;
+                               continue;
                        }
 
-#ifndef SLAPD_MULTIMASTER
-               /* send a referral */
+                       /* attribute not manageable */
+                       snprintf( textbuf, textlen,
+                               "%s: no-user-modification attribute not manageable",
+                               ml->sml_type.bv_val );
+
                } else {
-                       struct berval **defref = be->be_update_refs
-                               ? be->be_update_refs : default_referral;
-                       struct berval **ref = referral_rewrite( defref,
-                               NULL, pdn->bv_val, LDAP_SCOPE_DEFAULT );
+                       /* user modification disallowed */
+                       snprintf( textbuf, textlen,
+                               "%s: no user modification allowed",
+                               ml->sml_type.bv_val );
+               }
 
-                       send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
-                               ref ? ref : defref, NULL );
+               *text = textbuf;
+               return LDAP_CONSTRAINT_VIOLATION;
+       }
 
-                       ber_bvecfree( ref );
-#endif
+       return LDAP_SUCCESS;
+}
+
+int
+slap_mods_no_repl_user_mod_check(
+       Operation *op,
+       Modifications *ml,
+       const char **text,
+       char *textbuf,
+       size_t textlen )
+{
+       Modifications *mods;
+       Modifications *modp;
+
+       for ( mods = ml; mods != NULL; mods = mods->sml_next ) {
+               assert( mods->sml_op == LDAP_MOD_ADD );
+
+               /* check doesn't already appear */
+               for ( modp = ml; modp != NULL; modp = modp->sml_next ) {
+                       if ( mods->sml_desc == modp->sml_desc && mods != modp ) {
+                               snprintf( textbuf, textlen,
+                                       "attribute '%s' provided more than once",
+                                       mods->sml_desc->ad_cname.bv_val );
+                               *text = textbuf;
+                               return LDAP_TYPE_OR_VALUE_EXISTS;
+                       }
                }
-       } else {
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                   NULL, "operation not supported within namingContext",
-                       NULL, NULL );
        }
 
-cleanup:
-       free( dn.bv_val );
-       if( pdn != NULL ) ber_bvfree( pdn );
-       if( ndn != NULL ) ber_bvfree( ndn );
-       if ( modlist != NULL )
-               slap_modlist_free( modlist );
-       if ( mods != NULL )
-               slap_mods_free( mods );
-       return rc;
+       return LDAP_SUCCESS;
 }
 
 /*
- * convert a raw list of modifications to internal format
  * Do basic attribute type checking and syntax validation.
  */
-int slap_modlist2mods(
-       LDAPModList *ml,
-       int update,
-       Modifications **mods,
+int slap_mods_check(
+       Operation *op,
+       Modifications *ml,
        const char **text,
        char *textbuf,
-       size_t textlen )
+       size_t textlen,
+       void *ctx )
 {
        int rc;
-       Modifications **modtail = mods;
 
-       for( ; ml != NULL; ml = ml->ml_next ) {
-               Modifications *mod;
+       for( ; ml != NULL; ml = ml->sml_next ) {
                AttributeDescription *ad = NULL;
 
-               mod = (Modifications *)
-                       ch_calloc( 1, sizeof(Modifications) );
-
-               /* copy the op */
-               mod->sml_op = ml->ml_op;
-
                /* convert to attribute description */
-               rc = slap_str2ad( ml->ml_type, &mod->sml_desc, text );
-
-               if( rc != LDAP_SUCCESS ) {
-                       slap_mods_free( mod );
-                       snprintf( textbuf, textlen, "%s: %s",
-                               ml->ml_type, *text );
-                       *text = textbuf;
-                       return rc;
+               if ( ml->sml_desc == NULL ) {
+                       rc = slap_bv2ad( &ml->sml_type, &ml->sml_desc, text );
+                       if( rc != LDAP_SUCCESS ) {
+                               if ( get_no_schema_check( op )) {
+                                       rc = slap_bv2undef_ad( &ml->sml_type, &ml->sml_desc,
+                                               text, 0 );
+                               }
+                       }
+                       if( rc != LDAP_SUCCESS ) {
+                               snprintf( textbuf, textlen, "%s: %s",
+                                       ml->sml_type.bv_val, *text );
+                               *text = textbuf;
+                               return rc;
+                       }
                }
 
-               ad = mod->sml_desc;
+               ad = ml->sml_desc;
 
                if( slap_syntax_is_binary( ad->ad_type->sat_syntax )
                        && !slap_ad_is_binary( ad ))
                {
                        /* attribute requires binary transfer */
-                       slap_mods_free( mod );
-
                        snprintf( textbuf, textlen,
                                "%s: requires ;binary transfer",
-                               ml->ml_type );
+                               ml->sml_type.bv_val );
                        *text = textbuf;
                        return LDAP_UNDEFINED_TYPE;
                }
@@ -470,36 +490,53 @@ int slap_modlist2mods(
                if( !slap_syntax_is_binary( ad->ad_type->sat_syntax )
                        && slap_ad_is_binary( ad ))
                {
-                       /* attribute requires binary transfer */
-                       slap_mods_free( mod );
+                       /* attribute does not require binary transfer */
                        snprintf( textbuf, textlen,
                                "%s: disallows ;binary transfer",
-                               ml->ml_type );
+                               ml->sml_type.bv_val );
                        *text = textbuf;
                        return LDAP_UNDEFINED_TYPE;
                }
 
-               if (!update && is_at_no_user_mod( ad->ad_type )) {
-                       /* user modification disallowed */
-                       slap_mods_free( mod );
+               if( slap_ad_is_tag_range( ad )) {
+                       /* attribute requires binary transfer */
                        snprintf( textbuf, textlen,
-                               "%s: no user modification allowed",
-                               ml->ml_type );
+                               "%s: inappropriate use of tag range option",
+                               ml->sml_type.bv_val );
                        *text = textbuf;
-                       return LDAP_CONSTRAINT_VIOLATION;
+                       return LDAP_UNDEFINED_TYPE;
                }
 
+#if 0
                if ( is_at_obsolete( ad->ad_type ) &&
-                       ( mod->sml_op == LDAP_MOD_ADD || ml->ml_bvalues != NULL ) )
+                       (( ml->sml_op != LDAP_MOD_REPLACE &&
+                               ml->sml_op != LDAP_MOD_DELETE ) ||
+                                       ml->sml_values != NULL ))
                {
                        /*
                         * attribute is obsolete,
                         * only allow replace/delete with no values
                         */
-                       slap_mods_free( mod );
                        snprintf( textbuf, textlen,
                                "%s: attribute is obsolete",
-                               ml->ml_type );
+                               ml->sml_type.bv_val );
+                       *text = textbuf;
+                       return LDAP_CONSTRAINT_VIOLATION;
+               }
+#endif
+
+               if ( ml->sml_op == LDAP_MOD_INCREMENT &&
+#ifdef SLAPD_REAL_SYNTAX
+                       !is_at_syntax( ad->ad_type, SLAPD_REAL_SYNTAX ) &&
+#endif
+                       !is_at_syntax( ad->ad_type, SLAPD_INTEGER_SYNTAX ) )
+               {
+                       /*
+                        * attribute values must be INTEGER or REAL
+                        */
+                       snprintf( textbuf, textlen,
+                               "%s: attribute syntax inappropriate for increment",
+                               ml->sml_type.bv_val );
                        *text = textbuf;
                        return LDAP_CONSTRAINT_VIOLATION;
                }
@@ -507,7 +544,7 @@ int slap_modlist2mods(
                /*
                 * check values
                 */
-               if( ml->ml_bvalues != NULL ) {
+               if( ml->sml_values != NULL ) {
                        ber_len_t nvals;
                        slap_syntax_validate_func *validate =
                                ad->ad_type->sat_syntax->ssyn_validate;
@@ -515,11 +552,10 @@ int slap_modlist2mods(
                                ad->ad_type->sat_syntax->ssyn_pretty;
  
                        if( !pretty && !validate ) {
-                               slap_mods_free( mod );
                                *text = "no validator for syntax";
                                snprintf( textbuf, textlen,
                                        "%s: no validator for syntax %s",
-                                       ml->ml_type,
+                                       ml->sml_type.bv_val,
                                        ad->ad_type->sat_syntax->ssyn_oid );
                                *text = textbuf;
                                return LDAP_INVALID_SYNTAX;
@@ -529,181 +565,538 @@ int slap_modlist2mods(
                         * check that each value is valid per syntax
                         *      and pretty if appropriate
                         */
-                       for( nvals = 0; ml->ml_bvalues[nvals]; nvals++ ) {
-                               struct berval *pval = NULL;
-                               if( pretty ) {
-                                       rc = pretty( ad->ad_type->sat_syntax,
-                                               ml->ml_bvalues[nvals], &pval );
+                       for ( nvals = 0; !BER_BVISNULL( &ml->sml_values[nvals] ); nvals++ ) {
+                               struct berval pval;
+
+                               if ( pretty ) {
+                                       rc = ordered_value_pretty( ad,
+                                               &ml->sml_values[nvals], &pval, ctx );
                                } else {
-                                       rc = validate( ad->ad_type->sat_syntax,
-                                               ml->ml_bvalues[nvals] );
+                                       rc = ordered_value_validate( ad,
+                                               &ml->sml_values[nvals], ml->sml_op );
                                }
 
                                if( rc != 0 ) {
-                                       slap_mods_free( mod );
                                        snprintf( textbuf, textlen,
                                                "%s: value #%ld invalid per syntax",
-                                               ml->ml_type, (long) nvals );
+                                               ml->sml_type.bv_val, (long) nvals );
                                        *text = textbuf;
                                        return LDAP_INVALID_SYNTAX;
                                }
 
                                if( pretty ) {
-                                       ber_memfree( ml->ml_bvalues[nvals]->bv_val );
-                                       *ml->ml_bvalues[nvals] = *pval;
-                                       free( pval );
+                                       ber_memfree_x( ml->sml_values[nvals].bv_val, ctx );
+                                       ml->sml_values[nvals] = pval;
                                }
                        }
+                       ml->sml_numvals = nvals;
 
                        /*
                         * a rough single value check... an additional check is needed
                         * to catch add of single value to existing single valued attribute
                         */
-                       if( ( mod->sml_op == LDAP_MOD_ADD || mod->sml_op == LDAP_MOD_REPLACE )
+                       if ((ml->sml_op == LDAP_MOD_ADD || ml->sml_op == LDAP_MOD_REPLACE)
                                && nvals > 1 && is_at_single_value( ad->ad_type ))
                        {
-                               slap_mods_free( mod );
                                snprintf( textbuf, textlen,
-                                       "%s: multiple value provided",
-                                       ml->ml_type );
+                                       "%s: multiple values provided",
+                                       ml->sml_type.bv_val );
                                *text = textbuf;
                                return LDAP_CONSTRAINT_VIOLATION;
                        }
-               }
 
-               mod->sml_bvalues = ml->ml_bvalues;
-               ml->ml_values = NULL;
+                       /* if the type has a normalizer, generate the
+                        * normalized values. otherwise leave them NULL.
+                        *
+                        * this is different from the rule for attributes
+                        * in an entry - in an attribute list, the normalized
+                        * value is set equal to the non-normalized value
+                        * when there is no normalizer.
+                        */
+                       if( nvals && ad->ad_type->sat_equality &&
+                               ad->ad_type->sat_equality->smr_normalize )
+                       {
+                               ml->sml_nvalues = ber_memalloc_x(
+                                       (nvals+1)*sizeof(struct berval), ctx );
+
+                               for ( nvals = 0; !BER_BVISNULL( &ml->sml_values[nvals] ); nvals++ ) {
+                                       rc = ordered_value_normalize(
+                                               SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+                                               ad,
+                                               ad->ad_type->sat_equality,
+                                               &ml->sml_values[nvals], &ml->sml_nvalues[nvals], ctx );
+                                       if ( rc ) {
+                                               Debug( LDAP_DEBUG_ANY,
+                                                       "<= str2entry NULL (ssyn_normalize %d)\n",
+                                                       rc, 0, 0 );
+                                               snprintf( textbuf, textlen,
+                                                       "%s: value #%ld normalization failed",
+                                                       ml->sml_type.bv_val, (long) nvals );
+                                               *text = textbuf;
+                                               BER_BVZERO( &ml->sml_nvalues[nvals] );
+                                               return rc;
+                                       }
+                               }
 
-               *modtail = mod;
-               modtail = &mod->sml_next;
+                               BER_BVZERO( &ml->sml_nvalues[nvals] );
+                       }
+
+                       /* check for duplicates, but ignore Deletes.
+                        */
+                       if( nvals > 1 && ml->sml_op != LDAP_MOD_DELETE ) {
+                               int i;
+                               rc = slap_sort_vals( ml, text, &i, ctx );
+                               if ( rc == LDAP_TYPE_OR_VALUE_EXISTS ) {
+                                       /* value exists already */
+                                       snprintf( textbuf, textlen,
+                                               "%s: value #%d provided more than once",
+                                               ml->sml_desc->ad_cname.bv_val, i );
+                                       *text = textbuf;
+                               }
+                               if ( rc )
+                                       return rc;
+                       }
+               } else {
+                       ml->sml_numvals = 0;
+               }
        }
 
        return LDAP_SUCCESS;
 }
 
-int slap_mods_opattrs(
-       Operation *op,
-       Modifications *mods,
-       Modifications **modtail,
+/* Sort a set of values. An (Attribute *) may be used interchangeably here
+ * instead of a (Modifications *) structure.
+ *
+ * Uses Quicksort + Insertion sort for small arrays
+ */
+
+int
+slap_sort_vals(
+       Modifications *ml,
        const char **text,
-       char *textbuf, size_t textlen )
+       int *dup,
+       void *ctx )
 {
-       struct berval name, timestamp, csn;
-       time_t now = slap_get_time();
-       char timebuf[22];
-       char csnbuf[64];
-       struct tm *ltm;
-       Modifications *mod;
+       AttributeDescription *ad;
+       MatchingRule *mr;
+       int istack[sizeof(int)*16];
+       int i, j, k, l, ir, jstack, match, *ix, itmp, nvals, rc;
+       int is_norm;
+       struct berval a, *cv;
+
+#define SMALL  8
+#define        SWAP(a,b,tmp)   tmp=(a);(a)=(b);(b)=tmp
+#define        COMP(a,b)       match=0; rc = ordered_value_match( &match, \
+                                               ad, mr, SLAP_MR_EQUALITY \
+                                                               | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX \
+                                                               | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH \
+                                                               | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH, \
+                                                               &(a), &(b), text );
+
+#define        IX(x)   ix[x]
+#define        EXCH(x,y)       SWAP(ix[x],ix[y],itmp)
+#define        SETA(x) itmp = ix[x]; a = cv[itmp]
+#define        GETA(x) ix[x] = itmp;
+#define        SET(x,y)        ix[x] = ix[y]
+
+       ad = ml->sml_desc;
+       nvals = ml->sml_numvals;
+
+       /* For Modifications, sml_nvalues is NULL if normalization wasn't needed.
+        * For Attributes, sml_nvalues == sml_values when normalization isn't needed.
+        */
+       if ( ml->sml_nvalues && ml->sml_nvalues != ml->sml_values ) {
+               cv = ml->sml_nvalues;
+               is_norm = 1;
+       } else {
+               cv = ml->sml_values;
+               is_norm = 0;
+       }
+
+       if ( ad == slap_schema.si_ad_objectClass )
+               mr = NULL;      /* shortcut matching */
+       else
+               mr = ad->ad_type->sat_equality;
+
+       /* record indices to preserve input ordering */
+       ix = slap_sl_malloc( nvals * sizeof(int), ctx );
+       for (i=0; i<nvals; i++) ix[i] = i;
+
+       ir = nvals-1;
+       l = 0;
+       jstack = 0;
+
+       for(;;) {
+               if (ir - l < SMALL) {   /* Insertion sort */
+                       match=1;
+                       for (j=l+1;j<=ir;j++) {
+                               SETA(j);
+                               for (i=j-1;i>=0;i--) {
+                                       COMP(cv[IX(i)], a);
+                                       if ( match <= 0 )
+                                               break;
+                                       SET(i+1,i);
+                               }
+                               GETA(i+1);
+                               if ( match == 0 ) goto done;
+                       }
+                       if ( jstack == 0 ) break;
+                       if ( match == 0 ) break;
+                       ir = istack[jstack--];
+                       l = istack[jstack--];
+               } else {
+                       k = (l + ir) >> 1;      /* Choose median of left, center, right */
+                       EXCH(k, l+1);
+                       COMP( cv[IX(l)], cv[IX(ir)] );
+                       if ( match > 0 ) {
+                               EXCH(l, ir);
+                       } else if ( match == 0 ) {
+                               i = ir;
+                               break;
+                       }
+                       COMP( cv[IX(l+1)], cv[IX(ir)] );
+                       if ( match > 0 ) {
+                               EXCH(l+1, ir);
+                       } else if ( match == 0 ) {
+                               i = ir;
+                               break;
+                       }
+                       COMP( cv[IX(l)], cv[IX(l+1)] );
+                       if ( match > 0 ) {
+                               EXCH(l, l+1);
+                       } else if ( match == 0 ) {
+                               i = l;
+                               break;
+                       }
+                       i = l+1;
+                       j = ir;
+                       a = cv[IX(i)];
+                       for(;;) {
+                               do {
+                                       i++;
+                                       COMP( cv[IX(i)], a );
+                               } while( match < 0 );
+                               while( match > 0 ) {
+                                       j--;
+                                       COMP( cv[IX(j)], a );
+                               }
+                               if (j < i) {
+                                       match = 1;
+                                       break;
+                               }
+                               if ( match == 0 ) {
+                                       i = l+1;
+                                       break;
+                               }
+                               EXCH(i,j);
+                       }
+                       if ( match == 0 )
+                               break;
+                       EXCH(l+1,j);
+                       jstack += 2;
+                       if (ir-i+1 >= j) {
+                               istack[jstack] = ir;
+                               istack[jstack-1] = i;
+                               ir = j;
+                       } else {
+                               istack[jstack] = j;
+                               istack[jstack-1] = l;
+                               l = i;
+                       }
+               }
+       }
+       done:
+       if ( i >= 0 )
+               *dup = ix[i];
+
+       /* For sorted attributes, put the values in index order */
+       if ( rc == LDAP_SUCCESS && match &&
+               ( ad->ad_type->sat_flags & SLAP_AT_SORTED_VAL )) {
+               BerVarray tmpv = slap_sl_malloc( sizeof( struct berval ) * nvals, ctx );
+               for ( i = 0; i<nvals; i++ )
+                       tmpv[i] = cv[ix[i]];
+               for ( i = 0; i<nvals; i++ )
+                       cv[i] = tmpv[i];
+               /* Check if the non-normalized array needs to move too */
+               if ( is_norm ) {
+                       cv = ml->sml_values;
+                       for ( i = 0; i<nvals; i++ )
+                               tmpv[i] = cv[ix[i]];
+                       for ( i = 0; i<nvals; i++ )
+                               cv[i] = tmpv[i];
+               }
+               slap_sl_free( tmpv, ctx );
+       }
 
-       int mop = op->o_tag == LDAP_REQ_ADD
-               ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
+       slap_sl_free( ix, ctx );
 
-       assert( modtail != NULL );
-       assert( *modtail == NULL );
+       if ( rc != LDAP_SUCCESS ) {
+               return rc;
+       } else if ( match == 0 ) {
+               /* value exists already */
+               assert( i >= 0 );
+               assert( i < nvals );
+               return LDAP_TYPE_OR_VALUE_EXISTS;
+       }
+       return LDAP_SUCCESS;
+}
 
+/* Enter with bv->bv_len = sizeof buffer, returns with
+ * actual length of string
+ */
+void slap_timestamp( time_t *tm, struct berval *bv )
+{
+       struct tm *ltm;
+#ifdef HAVE_GMTIME_R
+       struct tm ltm_buf;
+
+       ltm = gmtime_r( tm, &ltm_buf );
+#else
        ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-       ltm = gmtime( &now );
-       strftime( timebuf, sizeof(timebuf), "%Y%m%d%H%M%SZ", ltm );
+       ltm = gmtime( tm );
+#endif
+
+       bv->bv_len = lutil_gentime( bv->bv_val, bv->bv_len, ltm );
 
-       csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
+#ifndef HAVE_GMTIME_R
        ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-       csn.bv_val = csnbuf;
+#endif
+}
 
-       timestamp.bv_val = timebuf;
-       timestamp.bv_len = strlen(timebuf);
+/* 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 **modsp,
+       int manage_ctxcsn )
+{
+       struct berval name, timestamp, csn = BER_BVNULL;
+       struct berval nname;
+       char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+       char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
+       Modifications *mod, **modtail, *modlast;
+       int gotcsn = 0, gotmname = 0, gotmtime = 0;
+
+       if ( SLAP_LASTMOD( op->o_bd ) && !op->orm_no_opattrs ) {
+               char *ptr;
+               timestamp.bv_val = timebuf;
+               for ( modtail = modsp; *modtail; modtail = &(*modtail)->sml_next ) {
+                       if ( (*modtail)->sml_op != LDAP_MOD_ADD &&
+                               (*modtail)->sml_op != SLAP_MOD_SOFTADD &&
+                               (*modtail)->sml_op != LDAP_MOD_REPLACE )
+                       {
+                               continue;
+                       }
 
-       if( op->o_dn.bv_len == 0 ) {
-               name.bv_val = SLAPD_ANONYMOUS;
-               name.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
-       } else {
-               name = op->o_dn;
-       }
+                       if ( (*modtail)->sml_desc == slap_schema.si_ad_entryCSN )
+                       {
+                               csn = (*modtail)->sml_values[0];
+                               gotcsn = 1;
 
-       if( op->o_tag == LDAP_REQ_ADD ) {
-               struct berval tmpval;
-               char uuidbuf[40];
-               int rc;
+                       } else if ( (*modtail)->sml_desc == slap_schema.si_ad_modifiersName )
+                       {
+                               gotmname = 1;
 
-               rc = mods_structural_class( mods, &tmpval, text, textbuf, textlen );
-               if( rc != LDAP_SUCCESS ) {
-                       return rc;
+                       } else if ( (*modtail)->sml_desc == slap_schema.si_ad_modifyTimestamp )
+                       {
+                               gotmtime = 1;
+                       }
                }
-               if ( tmpval.bv_len ) {
-                       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
-                       mod->sml_op = mop;
-                       mod->sml_desc = slap_schema.si_ad_structuralObjectClass;
-                       mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
-                       mod->sml_bvalues[0] = ber_bvdup( &tmpval );
-                       mod->sml_bvalues[1] = NULL;
-                       assert( mod->sml_bvalues[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 = STRLENOF("YYYYMMDDHHMMSSZ");
+                       AC_MEMCPY( timebuf, csn.bv_val, timestamp.bv_len );
+                       timebuf[timestamp.bv_len-1] = 'Z';
+                       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;
+               }
+
+               if ( !gotcsn ) {
+                       mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+                       mod->sml_op = LDAP_MOD_REPLACE;
+                       mod->sml_flags = SLAP_MOD_INTERNAL;
+                       mod->sml_next = NULL;
+                       BER_BVZERO( &mod->sml_type );
+                       mod->sml_desc = slap_schema.si_ad_entryCSN;
+                       mod->sml_numvals = 1;
+                       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;
                }
 
-               tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
-               tmpval.bv_val = uuidbuf;
-               
-               mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
-               mod->sml_op = mop;
-               mod->sml_desc = slap_schema.si_ad_entryUUID;
-               mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
-               mod->sml_bvalues[0] = ber_bvdup( &tmpval );
-               mod->sml_bvalues[1] = NULL;
-               assert( mod->sml_bvalues[0] );
-               *modtail = mod;
-               modtail = &mod->sml_next;
+               if ( !gotmname ) {
+                       mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+                       mod->sml_op = LDAP_MOD_REPLACE;
+                       mod->sml_flags = SLAP_MOD_INTERNAL;
+                       mod->sml_next = NULL;
+                       BER_BVZERO( &mod->sml_type );
+                       mod->sml_desc = slap_schema.si_ad_modifiersName;
+                       mod->sml_numvals = 1;
+                       mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                       ber_dupbv( &mod->sml_values[0], &name );
+                       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 );
+                       BER_BVZERO( &mod->sml_nvalues[1] );
+                       assert( !BER_BVISNULL( &mod->sml_nvalues[0] ) );
+                       *modtail = mod;
+                       modtail = &mod->sml_next;
+               }
 
-               mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
-               mod->sml_op = mop;
-               mod->sml_desc = slap_schema.si_ad_creatorsName;
-               mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
-               mod->sml_bvalues[0] = ber_bvdup( &name );
-               mod->sml_bvalues[1] = NULL;
-               assert( mod->sml_bvalues[0] );
-               *modtail = mod;
-               modtail = &mod->sml_next;
+               if ( !gotmtime ) {
+                       mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+                       mod->sml_op = LDAP_MOD_REPLACE;
+                       mod->sml_flags = SLAP_MOD_INTERNAL;
+                       mod->sml_next = NULL;
+                       BER_BVZERO( &mod->sml_type );
+                       mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
+                       mod->sml_numvals = 1;
+                       mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                       ber_dupbv( &mod->sml_values[0], &timestamp );
+                       BER_BVZERO( &mod->sml_values[1] );
+                       assert( !BER_BVISNULL( &mod->sml_values[0] ) );
+                       mod->sml_nvalues = NULL;
+                       *modtail = mod;
+                       modtail = &mod->sml_next;
+               }
+       }
+}
+
+int
+slap_parse_modlist(
+       Operation *op,
+       SlapReply *rs,
+       BerElement *ber,
+       req_modify_s *ms )
+{
+       ber_tag_t       tag;
+       ber_len_t       len;
+       char            *last;
+       Modifications   **modtail = &ms->rs_mods.rs_modlist;
+
+       ms->rs_mods.rs_modlist = NULL;
+       ms->rs_increment = 0;
+
+       rs->sr_err = LDAP_SUCCESS;
+
+       /* collect modifications & save for later */
+       for ( tag = ber_first_element( ber, &len, &last );
+               tag != LBER_DEFAULT;
+               tag = ber_next_element( ber, &len, last ) )
+       {
+               ber_int_t mop;
+               Modifications tmp, *mod;
+
+               tmp.sml_nvalues = NULL;
+
+               if ( ber_scanf( ber, "{e{m[W]}}", &mop,
+                   &tmp.sml_type, &tmp.sml_values ) == LBER_ERROR )
+               {
+                       rs->sr_text = "decoding modlist error";
+                       rs->sr_err = LDAP_PROTOCOL_ERROR;
+                       goto done;
+               }
 
-               mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+               mod = (Modifications *) ch_malloc( sizeof(Modifications) );
                mod->sml_op = mop;
-               mod->sml_desc = slap_schema.si_ad_createTimestamp;
-               mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
-               mod->sml_bvalues[0] = ber_bvdup( &timestamp );
-               mod->sml_bvalues[1] = NULL;
-               assert( mod->sml_bvalues[0] );
+               mod->sml_flags = 0;
+               mod->sml_type = tmp.sml_type;
+               mod->sml_values = tmp.sml_values;
+               mod->sml_nvalues = NULL;
+               mod->sml_desc = NULL;
+               mod->sml_next = NULL;
                *modtail = mod;
+
+               switch( mop ) {
+               case LDAP_MOD_ADD:
+                       if ( mod->sml_values == NULL ) {
+                               rs->sr_text = "modify/add operation requires values";
+                               rs->sr_err = LDAP_PROTOCOL_ERROR;
+                               goto done;
+                       }
+
+                       /* fall through */
+
+               case LDAP_MOD_DELETE:
+               case LDAP_MOD_REPLACE:
+                       break;
+
+               case LDAP_MOD_INCREMENT:
+                       if( op->o_protocol >= LDAP_VERSION3 ) {
+                               ms->rs_increment++;
+                               if ( mod->sml_values == NULL ) {
+                                       rs->sr_text = "modify/increment operation requires value";
+                                       rs->sr_err = LDAP_PROTOCOL_ERROR;
+                                       goto done;
+                               }
+
+                               if ( !BER_BVISNULL( &mod->sml_values[ 1 ] ) ) {
+                                       rs->sr_text = "modify/increment operation requires single value";
+                                       rs->sr_err = LDAP_PROTOCOL_ERROR;
+                                       goto done;
+                               }
+
+                               break;
+                       }
+                       /* fall thru */
+
+               default:
+                       rs->sr_text = "unrecognized modify operation";
+                       rs->sr_err = LDAP_PROTOCOL_ERROR;
+                       goto done;
+               }
+
                modtail = &mod->sml_next;
        }
+       *modtail = NULL;
 
-       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
-       mod->sml_op = mop;
-       mod->sml_desc = slap_schema.si_ad_entryCSN;
-       mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof(struct berval *) );
-       mod->sml_bvalues[0] = ber_bvdup( &csn );
-       mod->sml_bvalues[1] = NULL;
-       assert( mod->sml_bvalues[0] );
-       *modtail = mod;
-       modtail = &mod->sml_next;
-
-       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
-       mod->sml_op = mop;
-       mod->sml_desc = slap_schema.si_ad_modifiersName;
-       mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof(struct berval *) );
-       mod->sml_bvalues[0] = ber_bvdup( &name );
-       mod->sml_bvalues[1] = NULL;
-       assert( mod->sml_bvalues[0] );
-       *modtail = mod;
-       modtail = &mod->sml_next;
-
-       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
-       mod->sml_op = mop;
-       mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
-       mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof(struct berval *) );
-       mod->sml_bvalues[0] = ber_bvdup( &timestamp );
-       mod->sml_bvalues[1] = NULL;
-       assert( mod->sml_bvalues[0] );
-       *modtail = mod;
-       modtail = &mod->sml_next;
+done:
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               slap_mods_free( ms->rs_mods.rs_modlist, 1 );
+               ms->rs_mods.rs_modlist = NULL;
+               ms->rs_increment = 0;
+       }
 
-       return LDAP_SUCCESS;
+       return rs->sr_err;
 }