X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fmodify.c;h=9ab73b0725b944b6a92a721eaab0f8204f0712b0;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=1896fb9011b2ea7be7bc021d81b5840f7682676b;hpb=dd66e6e9292c1a250a89865d691f836003d08517;p=openldap

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 1896fb9011..9ab73b0725 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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-2003 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
@@ -23,22 +31,20 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "lutil.h"
-
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
 #include "slapi.h"
 #endif
+#include "lutil.h"
+
 
 int
 do_modify(
-    Connection	*conn,
-    Operation	*op )
+    Operation	*op,
+    SlapReply	*rs )
 {
 	struct berval dn = { 0, NULL };
-	struct berval pdn = { 0, NULL };
-	struct berval ndn = { 0, NULL };
 	char		*last;
 	ber_tag_t	tag;
 	ber_len_t	len;
@@ -49,12 +55,9 @@ do_modify(
 #endif
 #ifdef LDAP_SLAPI
 	LDAPMod		**modv = NULL;
-	Slapi_PBlock *pb = op->o_pb;
 #endif
-	Backend		*be;
-	int rc;
-	const char	*text;
 	int manageDSAit;
+	int increment = 0;
 
 #ifdef NEW_LOGGING
 	LDAP_LOG( OPERATION, ENTRY, "do_modify: enter\n", 0, 0, 0 );
@@ -88,8 +91,7 @@ do_modify(
 		Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 );
 #endif
 
-		send_ldap_disconnect( conn, op,
-			LDAP_PROTOCOL_ERROR, "decoding error" );
+		send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
 		return SLAPD_DISCONNECT;
 	}
 
@@ -109,17 +111,14 @@ do_modify(
 		ber_int_t mop;
 		Modifications tmp, *mod;
 
-#ifdef SLAP_NVALUES
 		tmp.sml_nvalues = NULL;
-#endif
 
 		if ( ber_scanf( op->o_ber, "{i{m[W]}}", &mop,
 		    &tmp.sml_type, &tmp.sml_values )
 		    == LBER_ERROR )
 		{
-			send_ldap_disconnect( conn, op,
-				LDAP_PROTOCOL_ERROR, "decoding modlist error" );
-			rc = SLAPD_DISCONNECT;
+			send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding modlist error" );
+			rs->sr_err = SLAPD_DISCONNECT;
 			goto cleanup;
 		}
 
@@ -127,9 +126,7 @@ do_modify(
 		mod->sml_op = mop;
 		mod->sml_type = tmp.sml_type;
 		mod->sml_values = tmp.sml_values;
-#ifdef SLAP_NVALUES
 		mod->sml_nvalues = NULL;
-#endif
 		mod->sml_desc = NULL;
 		mod->sml_next = NULL;
 		*modtail = mod;
@@ -147,10 +144,8 @@ do_modify(
 					(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;
+				send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+					"modify/add operation requires values" );
 				goto cleanup;
 			}
 
@@ -160,19 +155,58 @@ do_modify(
 		case LDAP_MOD_REPLACE:
 			break;
 
+		case LDAP_MOD_INCREMENT:
+			if( op->o_protocol >= LDAP_VERSION3 ) {
+				increment++;
+				if ( mod->sml_values == NULL ) {
+#ifdef NEW_LOGGING
+					LDAP_LOG( OPERATION, ERR, "do_modify: "
+						"modify/increment operation (%ld) requires value\n",
+						(long)mop, 0, 0 );
+#else
+					Debug( LDAP_DEBUG_ANY, "do_modify: "
+						"modify/increment operation (%ld) requires value\n",
+						(long) mop, 0, 0 );
+#endif
+
+					send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+						"modify/increment operation requires value" );
+					goto cleanup;
+				}
+
+				if( mod->sml_values[1].bv_val ) {
+#ifdef NEW_LOGGING
+					LDAP_LOG( OPERATION, ERR, "do_modify: modify/increment "
+						"operation (%ld) requires single value\n",
+						(long)mop, 0, 0 );
+#else
+					Debug( LDAP_DEBUG_ANY, "do_modify: modify/increment "
+						"operation (%ld) requires single value\n",
+						(long) mop, 0, 0 );
+#endif
+
+					send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+						"modify/increment operation requires single value" );
+					goto cleanup;
+				}
+
+				break;
+			}
+			/* fall thru */
+
 		default: {
 #ifdef NEW_LOGGING
 				LDAP_LOG( OPERATION, ERR, 
-					"do_modify: invalid modify operation (%ld)\n", (long)mop, 0, 0 );
+					"do_modify: unrecognized modify operation (%ld)\n",
+					(long)mop, 0, 0 );
 #else
 				Debug( LDAP_DEBUG_ANY,
-					"do_modify: invalid modify operation (%ld)\n",
+					"do_modify: unrecognized 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;
+				send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+					"unrecognized modify operation" );
 				goto cleanup;
 			}
 		}
@@ -181,7 +215,7 @@ do_modify(
 	}
 	*modtail = NULL;
 
-	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+	if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR, "do_modify: get_ctrls failed\n", 0, 0, 0 );
 #else
@@ -191,21 +225,21 @@ do_modify(
 		goto cleanup;
 	}
 
-	rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
-	if( rc != LDAP_SUCCESS ) {
+	rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
+		op->o_tmpmemctx );
+	if( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, INFO, "do_modify: conn %d  invalid dn (%s)\n",
-			conn->c_connid, dn.bv_val, 0 );
+			op->o_connid, dn.bv_val, 0 );
 #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 );
+		send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
 		goto cleanup;
 	}
 
-	if( ndn.bv_len == 0 ) {
+	if( op->o_req_ndn.bv_len == 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR, 
 			"do_modify: attempt to modify root DSE.\n",0, 0, 0 );
@@ -213,11 +247,11 @@ do_modify(
 		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 );
+		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+			"modify upon the root DSE not supported" );
 		goto cleanup;
 
-	} else if ( bvmatch( &ndn, &global_schemandn ) ) {
+	} else if ( bvmatch( &op->o_req_ndn, &global_schemandn ) ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR,
 			"do_modify: attempt to modify subschema subentry.\n" , 0, 0, 0  );
@@ -225,9 +259,8 @@ do_modify(
 		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 );
+		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+			"modification of subschema subentry not supported" );
 		goto cleanup;
 	}
 
@@ -241,9 +274,10 @@ do_modify(
 	for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, DETAIL1, "\t%s:  %s\n", 
-			tmp->sml_op == LDAP_MOD_ADD ?
-			"add" : (tmp->sml_op == LDAP_MOD_DELETE ?
-			"delete" : "replace"), tmp->sml_type.bv_val, 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->sml_values == NULL ) {
 			LDAP_LOG( OPERATION, DETAIL1, "\t\tno values", 0, 0, 0 );
@@ -257,9 +291,10 @@ do_modify(
 
 #else
 		Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n",
-			tmp->sml_op == LDAP_MOD_ADD
-				? "add" : (tmp->sml_op == LDAP_MOD_DELETE
-					? "delete" : "replace"), tmp->sml_type.bv_val, 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->sml_values == NULL ) {
 			Debug( LDAP_DEBUG_ARGS, "%s\n",
@@ -276,7 +311,6 @@ do_modify(
 		}
 #endif
 	}
-#endif
 
 	if ( StatslogTest( LDAP_DEBUG_STATS ) ) {
 		char abuf[BUFSIZ/2], *ptr = abuf;
@@ -289,8 +323,15 @@ do_modify(
 			if (len + 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
 				Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD attr=%s\n",
 				    op->o_connid, op->o_opid, abuf, 0, 0 );
-	    			len = 0;
+
+	    		len = 0;
 				ptr = abuf;
+
+				if( 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
+					Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD attr=%s\n",
+						op->o_connid, op->o_opid, tmp->sml_type.bv_val, 0, 0 );
+					continue;
+				}
 			}
 			if (len) {
 				*ptr++ = ' ';
@@ -304,6 +345,7 @@ do_modify(
 	    			op->o_connid, op->o_opid, abuf, 0, 0 );
 		}
 	}
+#endif	/* LDAP_DEBUG */
 
 	manageDSAit = get_manageDSAit( op );
 
@@ -312,71 +354,99 @@ do_modify(
 	 * appropriate one, or send a referral to our "referral server"
 	 * if we don't hold it.
 	 */
-	if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
-		BerVarray ref = referral_rewrite( default_referral,
-			NULL, &pdn, LDAP_SCOPE_DEFAULT );
+	op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 );
+	if ( op->o_bd == NULL ) {
+		rs->sr_ref = referral_rewrite( default_referral,
+			NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
+		if (!rs->sr_ref) rs->sr_ref = default_referral;
 
-		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-			NULL, NULL, ref ? ref : default_referral, NULL );
+		if (rs->sr_ref != NULL ) {
+			rs->sr_err = LDAP_REFERRAL;
+			send_ldap_result( op, rs );
 
-		ber_bvarray_free( ref );
+			if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
+		} else {
+			send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+				"referral missing" );
+		}
 		goto cleanup;
 	}
 
 	/* check restrictions */
-	rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
-	if( rc != LDAP_SUCCESS ) {
-		send_ldap_result( conn, op, rc,
-			NULL, text, NULL, NULL );
+	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, &ndn );
-	if ( rc != LDAP_SUCCESS ) {
+	if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
 		goto cleanup;
 	}
 
+	/* check for modify/increment support */
+	if( increment && !SLAP_INCREMENT( op->o_bd ) ) {
+		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+			"modify/increment not supported in context" );
+	}
+
 #if defined( LDAP_SLAPI )
-	slapi_x_backend_set_pb( pb, be );
-	slapi_x_connection_set_pb( pb, conn );
-	slapi_x_operation_set_pb( pb, op );
-	slapi_pblock_set( pb, SLAPI_MODIFY_TARGET, (void *)dn.bv_val );
-	slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
-	modv = slapi_x_modifications2ldapmods( &modlist );
-	slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)modv );
-
-	rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_MODIFY_FN, pb );
-	if ( rc != 0 ) {
-		/*
-		 * A preoperation plugin failure will abort the
-		 * entire operation.
-		 */
+#define pb	op->o_pb
+	if ( pb ) {
+		slapi_int_pblock_set_operation( pb, op );
+		slapi_pblock_set( pb, SLAPI_MODIFY_TARGET, (void *)dn.bv_val );
+		slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
+		modv = slapi_int_modifications2ldapmods( &modlist );
+		slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)modv );
+
+		rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_MODIFY_FN, pb );
+		if ( rs->sr_err < 0 ) {
+			/*
+			 * A preoperation plugin failure will abort the
+			 * entire operation.
+			 */
 #ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, INFO, "do_modify: modify preoperation plugin "
-				"failed\n", 0, 0, 0 );
+			LDAP_LOG( OPERATION, INFO, "do_modify: modify preoperation plugin "
+					"failed\n", 0, 0, 0 );
 #else
-		Debug(LDAP_DEBUG_TRACE, "do_modify: modify preoperation plugin failed.\n",
-				0, 0, 0);
+			Debug(LDAP_DEBUG_TRACE, "do_modify: modify preoperation plugin failed.\n",
+					0, 0, 0);
 #endif
-		if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0) {
-			rc = LDAP_OTHER;
+			if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 )  ||
+				 rs->sr_err == LDAP_SUCCESS ) {
+				rs->sr_err = LDAP_OTHER;
+			}
+			slapi_int_free_ldapmods( modv );
+			modv = NULL;
+			goto cleanup;
 		}
-		ldap_mods_free( modv, 1 );
-		modv = NULL;
-		goto cleanup;
+
+		/*
+		 * It's possible that the preoperation plugin changed the
+		 * modification array, so we need to convert it back to
+		 * a Modification list.
+		 *
+		 * Calling slapi_int_modifications2ldapmods() destroyed modlist so
+		 * we don't need to free it.
+		 */
+		slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
+		modlist = slapi_int_ldapmods2modifications( modv );
 	}
 
 	/*
-	 * It's possible that the preoperation plugin changed the
-	 * modification array, so we need to convert it back to
-	 * a Modification list.
+	 * NB: it is valid for the plugin to return no modifications
+	 * (for example, a plugin might store some attributes elsewhere
+	 * and remove them from the modification list; if only those
+	 * attribute types were included in the modification request,
+	 * then slapi_int_ldapmods2modifications() above will return
+	 * NULL).
 	 *
-	 * Calling slapi_x_modifications2ldapmods() destroyed modlist so
-	 * we don't need to free it.
+	 * However, the post-operation plugin should still be 
+	 * called.
 	 */
-	slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
-	modlist = slapi_x_ldapmods2modifications( modv );
+	if ( modlist == NULL ) {
+		rs->sr_err = LDAP_SUCCESS;
+		send_ldap_result( op, rs );
+	} else {
 #endif /* defined( LDAP_SLAPI ) */
 
 	/*
@@ -385,27 +455,29 @@ 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
+		int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
+
 		/* 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 )
+#ifndef SLAPD_MULTIMASTER
+		if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ) &&
+			( !op->o_bd->be_update_ndn.bv_len || repl_user ))
+#else
+		if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ))
 #endif
 		{
-			int update = be->be_update_ndn.bv_len;
-			const char *text;
+			int update = op->o_bd->be_update_ndn.bv_len;
 			char textbuf[SLAP_TEXT_BUFLEN];
 			size_t textlen = sizeof textbuf;
 
-			rc = slap_mods_check( modlist, update, &text,
-				textbuf, textlen );
+			rs->sr_err = slap_mods_check( modlist, update, &rs->sr_text,
+				textbuf, textlen, NULL );
 
-			if( rc != LDAP_SUCCESS ) {
-				send_ldap_result( conn, op, rc,
-					NULL, text, NULL, NULL );
+			if( rs->sr_err != LDAP_SUCCESS ) {
+				send_ldap_result( op, rs );
 				goto cleanup;
 			}
 
@@ -417,47 +489,65 @@ do_modify(
 					/* empty */
 				}
 
-				rc = slap_mods_opattrs( be, op, modlist, modtail, &text,
-					textbuf, textlen );
-				if( rc != LDAP_SUCCESS ) {
-					send_ldap_result( conn, op, rc,
-						NULL, text,
-						NULL, NULL );
+				rs->sr_err = slap_mods_opattrs( op, modlist, modtail,
+					&rs->sr_text, textbuf, textlen );
+				if( rs->sr_err != LDAP_SUCCESS ) {
+					send_ldap_result( op, rs );
 					goto cleanup;
 				}
 			}
 
-			if ( (*be->be_modify)( be, conn, op, &pdn, &ndn, modlist ) == 0
+			op->orm_modlist = modlist;
+			if ( (op->o_bd->be_modify)( op, rs ) == 0
 #ifdef SLAPD_MULTIMASTER
 				&& !repl_user
 #endif
 			) {
 				/* but we log only the ones not from a replicator user */
-				replog( be, op, &pdn, &ndn, modlist );
+				replog( op );
 			}
 
 #ifndef SLAPD_MULTIMASTER
 		/* send a referral */
 		} else {
-			BerVarray defref = be->be_update_refs
-				? be->be_update_refs : default_referral;
-			BerVarray ref = referral_rewrite( defref,
-				NULL, &pdn, LDAP_SCOPE_DEFAULT );
-
-			send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
-				ref ? ref : defref, NULL );
-
-			ber_bvarray_free( ref );
+			BerVarray defref = NULL;
+			if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
+				syncinfo_t *si;
+				LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
+					struct berval tmpbv;
+					ber_dupbv( &tmpbv, &si->si_provideruri_bv[0] );
+					ber_bvarray_add( &defref, &tmpbv );
+				}
+			} else {
+				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) rs->sr_ref = defref;
+				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,
+		    				"referral missing" );
+			}
 #endif
 		}
 	} else {
-		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-		    NULL, "operation not supported within namingContext",
-			NULL, NULL );
+		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+		    "operation not supported within namingContext" );
 	}
 
 #if defined( LDAP_SLAPI )
-	if ( doPluginFNs( be, SLAPI_PLUGIN_POST_MODIFY_FN, pb ) != 0 ) {
+	} /* modlist != NULL */
+
+	if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_MODIFY_FN, pb ) < 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, INFO, "do_modify: modify postoperation plugins "
 				"failed\n", 0, 0, 0 );
@@ -469,13 +559,16 @@ do_modify(
 #endif /* defined( LDAP_SLAPI ) */
 
 cleanup:
-	free( pdn.bv_val );
-	free( ndn.bv_val );
+
+	slap_graduate_commit_csn( op );
+
+	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 ( modlist != NULL ) slap_mods_free( modlist );
 #if defined( LDAP_SLAPI )
-	if ( modv != NULL ) slapi_x_free_ldapmods( modv );
+	if ( modv != NULL ) slapi_int_free_ldapmods( modv );
 #endif
-	return rc;
+	return rs->sr_err;
 }
 
 /*
@@ -486,7 +579,8 @@ int slap_mods_check(
 	int update,
 	const char **text,
 	char *textbuf,
-	size_t textlen )
+	size_t textlen,
+	void *ctx )
 {
 	int rc;
 
@@ -546,7 +640,9 @@ int slap_mods_check(
 		}
 
 		if ( is_at_obsolete( ad->ad_type ) &&
-			( ml->sml_op == LDAP_MOD_ADD || ml->sml_values != NULL ) )
+			(( ml->sml_op != LDAP_MOD_REPLACE &&
+				ml->sml_op != LDAP_MOD_DELETE ) ||
+					ml->sml_values != NULL ))
 		{
 			/*
 			 * attribute is obsolete,
@@ -559,6 +655,22 @@ int slap_mods_check(
 			return LDAP_CONSTRAINT_VIOLATION;
 		}
 
+		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;
+		}
+
 		/*
 		 * check values
 		 */
@@ -587,7 +699,7 @@ int slap_mods_check(
 				struct berval pval;
 				if( pretty ) {
 					rc = pretty( ad->ad_type->sat_syntax,
-						&ml->sml_values[nvals], &pval );
+						&ml->sml_values[nvals], &pval, ctx );
 				} else {
 					rc = validate( ad->ad_type->sat_syntax,
 						&ml->sml_values[nvals] );
@@ -602,21 +714,45 @@ int slap_mods_check(
 				}
 
 				if( pretty ) {
-					ber_memfree( ml->sml_values[nvals].bv_val );
+					ber_memfree_x( ml->sml_values[nvals].bv_val, ctx );
 					ml->sml_values[nvals] = pval;
 				}
 			}
 
-#ifdef SLAP_NVALUES
+			/*
+			 * a rough single value check... an additional check is needed
+			 * to catch add of single value to existing single valued attribute
+			 */
+			if ((ml->sml_op == LDAP_MOD_ADD || ml->sml_op == LDAP_MOD_REPLACE)
+				&& nvals > 1 && is_at_single_value( ad->ad_type ))
+			{
+				snprintf( textbuf, textlen,
+					"%s: multiple values provided",
+					ml->sml_type.bv_val );
+				*text = textbuf;
+				return LDAP_CONSTRAINT_VIOLATION;
+			}
+
+			/* 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_match &&
-				ad->ad_type->sat_syntax->ssyn_normalize )
+				ad->ad_type->sat_equality->smr_normalize )
 			{
-				ml->sml_nvalues = ch_malloc( (nvals+1)*sizeof(struct berval) );
+				ml->sml_nvalues = ber_memalloc_x(
+					(nvals+1)*sizeof(struct berval), ctx );
+
 				for( nvals = 0; ml->sml_values[nvals].bv_val; nvals++ ) {
-					rc = ad->ad_type->sat_syntax->ssyn_normalize(
+					rc = ad->ad_type->sat_equality->smr_normalize(
+						SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
 						ad->ad_type->sat_syntax,
-						&ml->sml_values[nvals], &ml->sml_nvalues[nvals] );
+						ad->ad_type->sat_equality,
+						&ml->sml_values[nvals], &ml->sml_nvalues[nvals], ctx );
 					if( rc ) {
 #ifdef NEW_LOGGING
 						LDAP_LOG( OPERATION, DETAIL1,
@@ -634,21 +770,9 @@ int slap_mods_check(
 						return rc;
 					}
 				}
-			}
-#endif
 
-			/*
-			 * a rough single value check... an additional check is needed
-			 * to catch add of single value to existing single valued attribute
-			 */
-			if ((ml->sml_op == LDAP_MOD_ADD || ml->sml_op == LDAP_MOD_REPLACE)
-				&& nvals > 1 && is_at_single_value( ad->ad_type ))
-			{
-				snprintf( textbuf, textlen,
-					"%s: multiple value provided",
-					ml->sml_type.bv_val );
-				*text = textbuf;
-				return LDAP_CONSTRAINT_VIOLATION;
+				ml->sml_nvalues[nvals].bv_val = NULL;
+				ml->sml_nvalues[nvals].bv_len = 0;
 			}
 		}
 	}
@@ -657,7 +781,6 @@ int slap_mods_check(
 }
 
 int slap_mods_opattrs(
-	Backend *be,
 	Operation *op,
 	Modifications *mods,
 	Modifications **modtail,
@@ -665,9 +788,7 @@ int slap_mods_opattrs(
 	char *textbuf, size_t textlen )
 {
 	struct berval name, timestamp, csn;
-#ifdef SLAP_NVALUES
 	struct berval nname;
-#endif
 	char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
 	char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 	Modifications *mod;
@@ -678,17 +799,26 @@ int slap_mods_opattrs(
 	assert( modtail != NULL );
 	assert( *modtail == NULL );
 
-	if( SLAP_LASTMOD(be) ) {
+	if ( SLAP_LASTMOD( op->o_bd )) {
 		struct tm *ltm;
+#ifdef HAVE_GMTIME_R
+		struct tm ltm_buf;
+#endif
 		time_t now = slap_get_time();
 
+#ifdef HAVE_GMTIME_R
+		ltm = gmtime_r( &now, &ltm_buf );
+#else
 		ldap_pvt_thread_mutex_lock( &gmtime_mutex );
 		ltm = gmtime( &now );
+#endif /* HAVE_GMTIME_R */
 		lutil_gentime( timebuf, sizeof(timebuf), ltm );
 
-		csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
+		slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 );
+
+#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);
@@ -696,14 +826,10 @@ int slap_mods_opattrs(
 		if( op->o_dn.bv_len == 0 ) {
 			name.bv_val = SLAPD_ANONYMOUS;
 			name.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
-#ifdef SLAP_NVALUES
 			nname = name;
-#endif
 		} else {
 			name = op->o_dn;
-#ifdef SLAP_NVALUES
 			nname = op->o_ndn;
-#endif
 		}
 	}
 
@@ -713,9 +839,7 @@ int slap_mods_opattrs(
 		if( global_schemacheck ) {
 			int rc = mods_structural_class( mods, &tmpval,
 				text, textbuf, textlen );
-			if( rc != LDAP_SUCCESS ) {
-				return rc;
-			}
+			if( rc != LDAP_SUCCESS ) return rc;
 
 			mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 			mod->sml_op = mop;
@@ -727,19 +851,17 @@ int slap_mods_opattrs(
 			mod->sml_values[1].bv_len = 0;
 			mod->sml_values[1].bv_val = NULL;
 			assert( mod->sml_values[0].bv_val );
-#ifdef SLAP_NVALUES
 			mod->sml_nvalues =
 				(BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
 			ber_dupbv( &mod->sml_nvalues[0], &tmpval );
 			mod->sml_nvalues[1].bv_len = 0;
 			mod->sml_nvalues[1].bv_val = NULL;
 			assert( mod->sml_nvalues[0].bv_val );
-#endif
 			*modtail = mod;
 			modtail = &mod->sml_next;
 		}
 
-		if( SLAP_LASTMOD(be) ) {
+		if ( SLAP_LASTMOD( op->o_bd )) {
 			char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
 
 			tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
@@ -755,9 +877,15 @@ int slap_mods_opattrs(
 			mod->sml_values[1].bv_len = 0;
 			mod->sml_values[1].bv_val = NULL;
 			assert( mod->sml_values[0].bv_val );
-#ifdef SLAP_NVALUES
-			mod->sml_nvalues = NULL;
-#endif
+			mod->sml_nvalues =
+				(BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+			(*mod->sml_desc->ad_type->sat_equality->smr_normalize)(
+					SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+					mod->sml_desc->ad_type->sat_syntax,
+					mod->sml_desc->ad_type->sat_equality,
+					mod->sml_values, mod->sml_nvalues, NULL );
+			mod->sml_nvalues[1].bv_len = 0;
+			mod->sml_nvalues[1].bv_val = NULL;
 			*modtail = mod;
 			modtail = &mod->sml_next;
 
@@ -765,19 +893,18 @@ int slap_mods_opattrs(
 			mod->sml_op = mop;
 			mod->sml_type.bv_val = NULL;
 			mod->sml_desc = slap_schema.si_ad_creatorsName;
-			mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+			mod->sml_values =
+				(BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
 			ber_dupbv( &mod->sml_values[0], &name );
 			mod->sml_values[1].bv_len = 0;
 			mod->sml_values[1].bv_val = NULL;
 			assert( mod->sml_values[0].bv_val );
-#ifdef SLAP_NVALUES
 			mod->sml_nvalues =
 				(BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
 			ber_dupbv( &mod->sml_nvalues[0], &nname );
 			mod->sml_nvalues[1].bv_len = 0;
 			mod->sml_nvalues[1].bv_val = NULL;
 			assert( mod->sml_nvalues[0].bv_val );
-#endif
 			*modtail = mod;
 			modtail = &mod->sml_next;
 
@@ -785,20 +912,19 @@ int slap_mods_opattrs(
 			mod->sml_op = mop;
 			mod->sml_type.bv_val = NULL;
 			mod->sml_desc = slap_schema.si_ad_createTimestamp;
-			mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+			mod->sml_values =
+				(BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
 			ber_dupbv( &mod->sml_values[0], &timestamp );
 			mod->sml_values[1].bv_len = 0;
 			mod->sml_values[1].bv_val = NULL;
 			assert( mod->sml_values[0].bv_val );
-#ifdef SLAP_NVALUES
 			mod->sml_nvalues = NULL;
-#endif
 			*modtail = mod;
 			modtail = &mod->sml_next;
 		}
 	}
 
-	if( SLAP_LASTMOD(be) ) {
+	if ( SLAP_LASTMOD( op->o_bd )) {
 		mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 		mod->sml_op = mop;
 		mod->sml_type.bv_val = NULL;
@@ -808,9 +934,7 @@ int slap_mods_opattrs(
 		mod->sml_values[1].bv_len = 0;
 		mod->sml_values[1].bv_val = NULL;
 		assert( mod->sml_values[0].bv_val );
-#ifdef SLAP_NVALUES
 		mod->sml_nvalues = NULL;
-#endif
 		*modtail = mod;
 		modtail = &mod->sml_next;
 
@@ -823,14 +947,12 @@ int slap_mods_opattrs(
 		mod->sml_values[1].bv_len = 0;
 		mod->sml_values[1].bv_val = NULL;
 		assert( mod->sml_values[0].bv_val );
-#ifdef SLAP_NVALUES
 		mod->sml_nvalues =
 			(BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
 		ber_dupbv( &mod->sml_nvalues[0], &nname );
 		mod->sml_nvalues[1].bv_len = 0;
 		mod->sml_nvalues[1].bv_val = NULL;
 		assert( mod->sml_nvalues[0].bv_val );
-#endif
 		*modtail = mod;
 		modtail = &mod->sml_next;
 
@@ -843,9 +965,7 @@ int slap_mods_opattrs(
 		mod->sml_values[1].bv_len = 0;
 		mod->sml_values[1].bv_val = NULL;
 		assert( mod->sml_values[0].bv_val );
-#ifdef SLAP_NVALUES
 		mod->sml_nvalues = NULL;
-#endif
 		*modtail = mod;
 		modtail = &mod->sml_next;
 	}