X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodify.c;h=e644a898b9c22ddb1cfc7041f6f7fd5ec3a8a3b6;hb=2c94c7915a52f8df4323c8193ec424df568f0fc1;hp=092e81e0b31a232c15006820114cd709811e67c7;hpb=b2f56a7318e97279798db6ca5b867ce00bf6d4f1;p=openldap

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 092e81e0b3..e644a898b9 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -23,35 +23,38 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
+#include "lutil.h"
+
 #include "ldap_pvt.h"
 #include "slap.h"
 
-
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-static int add_modified_attrs( Operation *op, Modifications **modlist );
-#endif
-
 int
 do_modify(
     Connection	*conn,
-    Operation	*op
-)
+    Operation	*op )
 {
-	char		*dn, *ndn = NULL;
+	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;
-	LDAPModList	*modlist = NULL;
-	LDAPModList	**modtail = &modlist;
+	Modifications	*modlist = NULL;
+	Modifications	**modtail = &modlist;
 #ifdef LDAP_DEBUG
-	LDAPModList *tmp;
+	Modifications *tmp;
 #endif
-	Modifications *mods = NULL;
 	Backend		*be;
 	int rc;
-	char	*text;
+	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 );
+#endif
 
 	/*
 	 * Parse the modify request.  It looks like this:
@@ -72,14 +75,26 @@ do_modify(
 	 *	}
 	 */
 
-	if ( ber_scanf( op->o_ber, "{a" /*}*/, &dn ) == LBER_ERROR ) {
+	if ( ber_scanf( op->o_ber, "{m" /*}*/, &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" );
 		return SLAPD_DISCONNECT;
 	}
 
-	Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn, 0, 0 );
+#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 */
 
@@ -88,11 +103,11 @@ do_modify(
 	    tag = ber_next_element( op->o_ber, &len, last ) )
 	{
 		ber_int_t mop;
+		Modifications tmp, *mod;
 
-		(*modtail) = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
 
-		if ( ber_scanf( op->o_ber, "{i{a[V]}}", &mop,
-		    &(*modtail)->ml_type, &(*modtail)->ml_bvalues )
+		if ( ber_scanf( op->o_ber, "{i{m[W]}}", &mop,
+		    &tmp.sml_type, &tmp.sml_bvalues )
 		    == LBER_ERROR )
 		{
 			send_ldap_disconnect( conn, op,
@@ -101,12 +116,25 @@ do_modify(
 			goto cleanup;
 		}
 
+		mod = (Modifications *) ch_malloc( sizeof(Modifications) );
+		mod->sml_type = tmp.sml_type;
+		mod->sml_bvalues = tmp.sml_bvalues;
+		mod->sml_desc = NULL;
+		*modtail = mod;
+
 		switch( mop ) {
 		case LDAP_MOD_ADD:
-			if ( (*modtail)->ml_bvalues == NULL ) {
+			if ( mod->sml_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 );
@@ -121,9 +149,16 @@ do_modify(
 			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;
@@ -131,74 +166,154 @@ do_modify(
 			}
 		}
 
-		(*modtail)->ml_op = mop;
-		
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-		attr_normalize( (*modtail)->ml_type );
-#endif
-
-		modtail = &(*modtail)->ml_next;
+		mod->sml_op = mop;
+		modtail = &mod->sml_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
+
 		goto cleanup;
 	}
 
-	ndn = ch_strdup( dn );
-
-	if(	dn_normalize( ndn ) == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "do_modify: invalid dn (%s)\n", dn, 0, 0 );
+	rc = dnPrettyNormal( NULL, &dn, &pdn, &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 );
 		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
+	}
+
 #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 );
-	for ( tmp = modlist; tmp != NULL; tmp = tmp->ml_next ) {
+#endif
+
+	for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_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 ));
+
+		if ( tmp->sml_bvalues == NULL ) {
+			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+			   "\t\tno values" ));
+		} else if ( tmp->sml_bvalues[0].bv_val == NULL ) {
+			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+			   "\t\tzero values" ));
+		} else if ( tmp->sml_bvalues[1].bv_val == NULL ) {
+			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+			   "\t\tone value" ));
+		} else {
+			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+			   "\t\tmultiple values" ));
+		}
+
+#else
 		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_DELETE
+					? "delete" : "replace"), tmp->sml_type.bv_val, 0 );
+
+		if ( tmp->sml_bvalues == NULL ) {
+			Debug( LDAP_DEBUG_ARGS, "%s\n",
+			   "\t\tno values", NULL, NULL );
+		} else if ( tmp->sml_bvalues[0].bv_val == NULL ) {
+			Debug( LDAP_DEBUG_ARGS, "%s\n",
+			   "\t\tzero values", NULL, NULL );
+		} else if ( tmp->sml_bvalues[1].bv_val == NULL ) {
+			Debug( LDAP_DEBUG_ARGS, "%s, length %ld\n",
+			   "\t\tone value", (long) tmp->sml_bvalues[0].bv_len, NULL );
+		} else {
+			Debug( LDAP_DEBUG_ARGS, "%s\n",
+			   "\t\tmultiple values", NULL, NULL );
+		}
+#endif
 	}
 #endif
 
-
 	Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MOD dn=\"%s\"\n",
-	    op->o_connid, op->o_opid, dn, 0, 0 );
+	    op->o_connid, op->o_opid, dn.bv_val, 0, 0 );
+
+	manageDSAit = get_manageDSAit( op );
 
 	/*
 	 * We could be serving multiple database backends.  Select the
 	 * appropriate one, or send a referral to our "referral server"
 	 * if we don't hold it.
 	 */
-	if ( (be = select_backend( ndn )) == NULL ) {
+	if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
+		BerVarray ref = referral_rewrite( default_referral,
+			NULL, &pdn, LDAP_SCOPE_DEFAULT );
+
 		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-			NULL, NULL, default_referral, NULL );
+			NULL, NULL, ref ? ref : default_referral, NULL );
+
+		ber_bvarray_free( ref );
 		goto cleanup;
 	}
 
-	/* make sure this backend recongizes critical controls */
-	rc = backend_check_controls( be, conn, op, &text ) ;
-
+	/* check restrictions */
+	rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
 	if( rc != LDAP_SUCCESS ) {
 		send_ldap_result( conn, op, rc,
 			NULL, text, NULL, NULL );
 		goto cleanup;
 	}
 
-	if ( global_readonly || be->be_readonly ) {
-		Debug( LDAP_DEBUG_ANY, "do_modify: database is read-only\n",
-		       0, 0, 0 );
-		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-		                  NULL, "directory is read-only", NULL, NULL );
+	/* check for referrals */
+	rc = backend_check_referrals( be, conn, op, &pdn, &ndn );
+	if ( rc != LDAP_SUCCESS ) {
 		goto cleanup;
 	}
 
 	/* deref suffix alias if appropriate */
-	ndn = suffix_alias( be, ndn );
+	suffix_alias( be, &ndn );
 
 	/*
 	 * do the modify if 1 && (2 || 3)
@@ -208,39 +323,38 @@ do_modify(
 	 */
 	if ( be->be_modify ) {
 		/* do the update here */
+		int repl_user = be_isupdate( be, &op->o_ndn );
 #ifndef SLAPD_MULTIMASTER
-		/* we don't have to check for replicator dn
-		 * because we accept each modify request
+		/* Multimaster slapd does not have to check for replicator dn
+		 * because it accepts each modify request
 		 */
-		if ( be->be_update_ndn == NULL ||
-			strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+		if ( !be->be_update_ndn.bv_len || repl_user )
 #endif
 		{
-			int update = be->be_update_ndn != NULL;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-			char *text;
-			rc = slap_modlist2mods( modlist, update, &mods, &text );
+			int update = be->be_update_ndn.bv_len;
+			const char *text;
+			char textbuf[SLAP_TEXT_BUFLEN];
+			size_t textlen = sizeof textbuf;
+
+			rc = slap_mods_check( modlist, update, &text,
+				textbuf, textlen );
 
 			if( rc != LDAP_SUCCESS ) {
 				send_ldap_result( conn, op, rc,
 					NULL, text, NULL, NULL );
 				goto cleanup;
 			}
-#else
-			mods = modlist;
-			modlist = NULL;
-#endif
 
-			if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
-				global_lastmod == ON)) && !update )
-			{
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-				rc = slap_mods_opattrs( op, &mods, &text );
-#else
-				char *text = "no-user-modification attribute type";
-				rc = add_modified_attrs( op, &mods );
-#endif
+			if ( SLAP_LASTMOD(be) && !repl_user ) {
+				for( modtail = &modlist;
+					*modtail != NULL;
+					modtail = &(*modtail)->sml_next )
+				{
+					/* empty */
+				}
 
+				rc = slap_mods_opattrs( op, modlist, modtail, &text,
+					textbuf, textlen );
 				if( rc != LDAP_SUCCESS ) {
 					send_ldap_result( conn, op, rc,
 						NULL, text,
@@ -249,76 +363,78 @@ do_modify(
 				}
 			}
 
-			if ( (*be->be_modify)( be, conn, op, dn, ndn, mods ) == 0 
+			if ( (*be->be_modify)( be, conn, op, &pdn, &ndn, modlist ) == 0
 #ifdef SLAPD_MULTIMASTER
-				&& ( be->be_update_ndn == NULL ||
-					strcmp( be->be_update_ndn, op->o_ndn ) != 0 )
+				&& !repl_user
 #endif
 			) {
 				/* but we log only the ones not from a replicator user */
-				replog( be, op, dn, mods );
+				replog( be, op, &pdn, &ndn, modlist );
 			}
 
 #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,
-				be->be_update_refs ? be->be_update_refs : default_referral,
-				NULL );
+				ref ? ref : defref, NULL );
+
+			ber_bvarray_free( ref );
 #endif
 		}
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-		    NULL, "operation not supported within namingContext", NULL, NULL );
+		    NULL, "operation not supported within namingContext",
+			NULL, NULL );
 	}
 
 cleanup:
-	free( dn );
-	if( ndn != NULL ) free( ndn );
+	free( pdn.bv_val );
+	free( ndn.bv_val );
 	if ( modlist != NULL )
-		slap_modlist_free( modlist );
-	if ( mods != NULL )
-		slap_mods_free( mods );
+		slap_mods_free( modlist );
 	return rc;
 }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 /*
- * convert a raw list of modifications to internal format
  * Do basic attribute type checking and syntax validation.
  */
-int slap_modlist2mods(
-	LDAPModList *ml,
+int slap_mods_check(
+	Modifications *ml,
 	int update,
-	Modifications **mods,
-	char **text )
+	const char **text,
+	char *textbuf,
+	size_t textlen )
 {
 	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) );
-
-		ad = mod->sml_desc;
-
 		/* convert to attribute description */
-		rc = slap_str2ad( ml->ml_type, &ad, text );
+		rc = slap_bv2ad( &ml->sml_type, &ml->sml_desc, text );
 
 		if( rc != LDAP_SUCCESS ) {
-			slap_mods_free( mod );
+			snprintf( textbuf, textlen, "%s: %s",
+				ml->sml_type.bv_val, *text );
+			*text = textbuf;
 			return rc;
 		}
 
+		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 );
-			*text = "attribute requires ;binary transfer";
+			snprintf( textbuf, textlen,
+				"%s: requires ;binary transfer",
+				ml->sml_type.bv_val );
+			*text = textbuf;
 			return LDAP_UNDEFINED_TYPE;
 		}
 
@@ -326,57 +442,98 @@ int slap_modlist2mods(
 			&& slap_ad_is_binary( ad ))
 		{
 			/* attribute requires binary transfer */
-			slap_mods_free( mod );
-			*text = "attribute disallows ;binary transfer";
+			snprintf( textbuf, textlen,
+				"%s: disallows ;binary transfer",
+				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 );
-			*text = "no user modification allowed";
+			snprintf( textbuf, textlen,
+				"%s: no user modification allowed",
+				ml->sml_type.bv_val );
+			*text = textbuf;
+			return LDAP_CONSTRAINT_VIOLATION;
+		}
+
+		if ( is_at_obsolete( ad->ad_type ) &&
+			( ml->sml_op == LDAP_MOD_ADD || ml->sml_bvalues != 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;
 		}
 
 		/*
 		 * check values
 		 */
-		if( ml->ml_bvalues != NULL ) {
+		if( ml->sml_bvalues != NULL ) {
 			ber_len_t nvals;
 			slap_syntax_validate_func *validate =
 				ad->ad_type->sat_syntax->ssyn_validate;
+			slap_syntax_transform_func *pretty =
+				ad->ad_type->sat_syntax->ssyn_pretty;
+ 
+			if( !pretty && !validate ) {
+				*text = "no validator for syntax";
+				snprintf( textbuf, textlen,
+					"%s: no validator for syntax %s",
+					ml->sml_type.bv_val,
+					ad->ad_type->sat_syntax->ssyn_oid );
+				*text = textbuf;
+				return LDAP_INVALID_SYNTAX;
+			}
 
 			/*
 			 * check that each value is valid per syntax
+			 *	and pretty if appropriate
 			 */
-			for( nvals = 0; ml->ml_bvalues[nvals]; nvals++ ) {
-				rc = validate( ad->ad_type->sat_syntax, ml->ml_bvalues[nvals] );
+			for( nvals = 0; ml->sml_bvalues[nvals].bv_val; nvals++ ) {
+				struct berval pval;
+				if( pretty ) {
+					rc = pretty( ad->ad_type->sat_syntax,
+						&ml->sml_bvalues[nvals], &pval );
+				} else {
+					rc = validate( ad->ad_type->sat_syntax,
+						&ml->sml_bvalues[nvals] );
+				}
 
 				if( rc != 0 ) {
-					slap_mods_free( mod );
-					*text = "value contains invalid data";
+					snprintf( textbuf, textlen,
+						"%s: value #%ld invalid per syntax",
+						ml->sml_type.bv_val, (long) nvals );
+					*text = textbuf;
 					return LDAP_INVALID_SYNTAX;
 				}
+
+				if( pretty ) {
+					ber_memfree( ml->sml_bvalues[nvals].bv_val );
+					ml->sml_bvalues[nvals] = pval;
+				}
 			}
 
 			/*
 			 * a rough single value check... an additional check is needed
 			 * to catch add of single value to existing single valued attribute
 			 */
-			if( ( ml->ml_op == LDAP_MOD_ADD || ml->ml_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 );
-				*text = "multiple values provided";
-				return LDAP_INVALID_SYNTAX;
+				snprintf( textbuf, textlen,
+					"%s: multiple value provided",
+					ml->sml_type.bv_val );
+				*text = textbuf;
+				return LDAP_CONSTRAINT_VIOLATION;
 			}
 		}
-
-		mod->sml_bvalues = ml->ml_bvalues;
-		ml->ml_values = NULL;
-
-		*modtail = mod;
-		modtail = &mod->sml_next;
 	}
 
 	return LDAP_SUCCESS;
@@ -384,183 +541,135 @@ int slap_modlist2mods(
 
 int slap_mods_opattrs(
 	Operation *op,
+	Modifications *mods,
 	Modifications **modtail,
-	char **text )
+	const char **text,
+	char *textbuf, size_t textlen )
 {
-	struct berval name, timestamp;
+	struct berval name, timestamp, csn;
 	time_t now = slap_get_time();
 	char timebuf[22];
+	char csnbuf[64];
 	struct tm *ltm;
 	Modifications *mod;
 
 	int mop = op->o_tag == LDAP_REQ_ADD
 		? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
 
+	assert( modtail != NULL );
+	assert( *modtail == NULL );
+
 	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
 	ltm = gmtime( &now );
 	strftime( timebuf, sizeof(timebuf), "%Y%m%d%H%M%SZ", ltm );
+
+	csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
 	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+	csn.bv_val = csnbuf;
+
 	timestamp.bv_val = timebuf;
 	timestamp.bv_len = strlen(timebuf);
 
-	if( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
-		name.bv_val = "<anonymous>";
-		name.bv_len = sizeof("<anonymous>")-1;
+	if( op->o_dn.bv_len == 0 ) {
+		name.bv_val = SLAPD_ANONYMOUS;
+		name.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
 	} else {
-		name.bv_val = op->o_dn;
-		name.bv_len = strlen( op->o_dn );
+		name = op->o_dn;
 	}
 
 	if( op->o_tag == LDAP_REQ_ADD ) {
-		mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+		struct berval tmpval;
+		char uuidbuf[40];
+		int rc;
+
+		rc = mods_structural_class( mods, &tmpval, text, textbuf, textlen );
+		if( rc != LDAP_SUCCESS ) {
+			return rc;
+		}
+		if ( tmpval.bv_len ) {
+			mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+			mod->sml_op = mop;
+			mod->sml_type.bv_val = NULL;
+			mod->sml_desc = slap_schema.si_ad_structuralObjectClass;
+			mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+			ber_dupbv( &mod->sml_bvalues[0], &tmpval );
+			mod->sml_bvalues[1].bv_val = NULL;
+			assert( mod->sml_bvalues[0].bv_val );
+			*modtail = mod;
+			modtail = &mod->sml_next;
+		}
+
+		tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
+		tmpval.bv_val = uuidbuf;
+		
+		mod = (Modifications *) ch_malloc( 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;
+		mod->sml_type.bv_val = NULL;
+		mod->sml_desc = slap_schema.si_ad_entryUUID;
+		mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+		ber_dupbv( &mod->sml_bvalues[0], &tmpval );
+		mod->sml_bvalues[1].bv_val = NULL;
+		assert( mod->sml_bvalues[0].bv_val );
+		*modtail = mod;
+		modtail = &mod->sml_next;
 
+		mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+		mod->sml_op = mop;
+		mod->sml_type.bv_val = NULL;
+		mod->sml_desc = slap_schema.si_ad_creatorsName;
+		mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+		ber_dupbv( &mod->sml_bvalues[0], &name );
+		mod->sml_bvalues[1].bv_val = NULL;
+		assert( mod->sml_bvalues[0].bv_val );
 		*modtail = mod;
 		modtail = &mod->sml_next;
 
-		mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+		mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 		mod->sml_op = mop;
+		mod->sml_type.bv_val = NULL;
 		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;
+		mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+		ber_dupbv( &mod->sml_bvalues[0], &timestamp );
+		mod->sml_bvalues[1].bv_val = NULL;
+		assert( mod->sml_bvalues[0].bv_val );
 		*modtail = mod;
 		modtail = &mod->sml_next;
 	}
 
-	mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+	mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 	mod->sml_op = mop;
+	mod->sml_type.bv_val = NULL;
+	mod->sml_desc = slap_schema.si_ad_entryCSN;
+	mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+	ber_dupbv( &mod->sml_bvalues[0], &csn );
+	mod->sml_bvalues[1].bv_val = NULL;
+	assert( mod->sml_bvalues[0].bv_val );
+	*modtail = mod;
+	modtail = &mod->sml_next;
+
+	mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+	mod->sml_op = mop;
+	mod->sml_type.bv_val = NULL;
 	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;
+	mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+	ber_dupbv( &mod->sml_bvalues[0], &name );
+	mod->sml_bvalues[1].bv_val = NULL;
+	assert( mod->sml_bvalues[0].bv_val );
 	*modtail = mod;
 	modtail = &mod->sml_next;
 
-	mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+	mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 	mod->sml_op = mop;
+	mod->sml_type.bv_val = NULL;
 	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;
+	mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+	ber_dupbv( &mod->sml_bvalues[0], &timestamp );
+	mod->sml_bvalues[1].bv_val = NULL;
+	assert( mod->sml_bvalues[0].bv_val );
 	*modtail = mod;
 	modtail = &mod->sml_next;
 
-	return LDAP_SUCCESS;
-}
-
-#else
-static int
-add_modified_attrs( Operation *op, Modifications **modlist )
-{
-	char		buf[22];
-	struct berval	bv;
-	struct berval	*bvals[2];
-	Modifications		*m;
-	struct tm	*ltm;
-	time_t		currenttime;
-
-	bvals[0] = &bv;
-	bvals[1] = NULL;
-
-	/* remove any attempts by the user to modify these attrs */
-	for ( m = *modlist; m != NULL; m = m->ml_next ) {
-		if ( oc_check_op_no_usermod_attr( m->ml_type ) ) {
-			return LDAP_CONSTRAINT_VIOLATION;
-		}
-	}
-
-	if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
-		bv.bv_val = "<anonymous>";
-		bv.bv_len = sizeof("<anonymous>")-1;
-	} else {
-		bv.bv_val = op->o_dn;
-		bv.bv_len = strlen( bv.bv_val );
-	}
-	m = (Modifications *) ch_calloc( 1, sizeof(Modifications) );
-	m->ml_type = ch_strdup( "modifiersname" );
-	m->ml_op = LDAP_MOD_REPLACE;
-	m->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
-	m->ml_bvalues[0] = ber_bvdup( &bv );
-	m->ml_next = *modlist;
-	*modlist = m;
-
-	currenttime = slap_get_time();
-	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-	ltm = gmtime( &currenttime );
-	strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-
-	bv.bv_val = buf;
-	bv.bv_len = strlen( bv.bv_val );
-	m = (Modifications *) ch_calloc( 1, sizeof(Modifications) );
-	m->ml_type = ch_strdup( "modifytimestamp" );
-	m->ml_op = LDAP_MOD_REPLACE;
-	m->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
-	m->ml_bvalues[0] = ber_bvdup( &bv );
-	m->ml_next = *modlist;
-	*modlist = m;
+	*modtail = NULL;
 
 	return LDAP_SUCCESS;
 }
-#endif
-
-void
-slap_mod_free(
-	Modification	*mod,
-	int				freeit
-)
-{
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	ad_free( mod->sm_desc, 1 );
-#else
-	if (mod->sm_desc) {
-		free( mod->sm_desc );
-	}
-#endif
-
-	if ( mod->sm_bvalues != NULL )
-		ber_bvecfree( mod->sm_bvalues );
-
-	if( freeit )
-		free( mod );
-}
-
-void
-slap_mods_free(
-    Modifications	*ml
-)
-{
-	Modifications *next;
-
-	for ( ; ml != NULL; ml = next ) {
-		next = ml->sml_next;
-
-		slap_mod_free( &ml->sml_mod, 0 );
-		free( ml );
-	}
-}
-
-void
-slap_modlist_free(
-    LDAPModList	*ml
-)
-{
-	LDAPModList *next;
-
-	for ( ; ml != NULL; ml = next ) {
-		next = ml->ml_next;
-
-		if (ml->ml_type)
-			free( ml->ml_type );
-
-		if ( ml->ml_bvalues != NULL )
-			ber_bvecfree( ml->ml_bvalues );
-
-		free( ml );
-	}
-}