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

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 081e484b68..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
  */
 /*
@@ -33,16 +33,17 @@ do_modify(
     Connection	*conn,
     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;
 	const char	*text;
@@ -50,7 +51,7 @@ do_modify(
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		   "do_modify: enter\n" ));
+		"do_modify: enter\n" ));
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
 #endif
@@ -74,10 +75,10 @@ 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" ));
+			"do_modify: ber_scanf failed\n" ));
 #else
 		Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -89,9 +90,9 @@ do_modify(
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-		   "do_modify: dn (%s)\n", dn ));
+		   "do_modify: dn (%s)\n", dn.bv_val ));
 #else
-	Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn, 0, 0 );
+	Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn.bv_val, 0, 0 );
 #endif
 
 
@@ -102,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,
@@ -115,13 +116,19 @@ 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 ));
+					"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",
@@ -144,8 +151,8 @@ do_modify(
 		default: {
 #ifdef NEW_LOGGING
 				LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-					   "do_modify: invalid modify operation (%ld)\n",
-					   (long)mop ));
+					"do_modify: invalid modify operation (%ld)\n",
+					(long)mop ));
 #else
 				Debug( LDAP_DEBUG_ANY,
 					"do_modify: invalid modify operation (%ld)\n",
@@ -159,15 +166,15 @@ do_modify(
 			}
 		}
 
-		(*modtail)->ml_op = mop;
-		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" ));
+			"do_modify: get_ctrls failed\n" ));
 #else
 		Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );
 #endif
@@ -175,25 +182,25 @@ do_modify(
 		goto cleanup;
 	}
 
-	ndn = ch_strdup( dn );
-
-	if(	dn_normalize( ndn ) == NULL ) {
+	rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
+	if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "do_modify:  invalid dn (%s)\n", dn ));
+		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, 0, 0 );
+		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 == '\0' ) {
+	if( ndn.bv_len == 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "do_modify: attempt to modify root DSE.\n" ));
+			"do_modify: attempt to modify root DSE.\n" ));
 #else
 		Debug( LDAP_DEBUG_ANY, "do_modify: root dse!\n", 0, 0, 0 );
 #endif
@@ -203,7 +210,7 @@ do_modify(
 		goto cleanup;
 
 #if defined( SLAPD_SCHEMA_DN )
-	} else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+	} 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" ));
@@ -226,20 +233,20 @@ do_modify(
 	Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
 #endif
 
-	for ( tmp = modlist; tmp != NULL; tmp = tmp->ml_next ) {
+	for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_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 ));
+			"\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->ml_bvalues == NULL ) {
+		if ( tmp->sml_bvalues == NULL ) {
 			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
 			   "\t\tno values" ));
-		} else if ( tmp->ml_bvalues[0] == NULL ) {
+		} else if ( tmp->sml_bvalues[0].bv_val == NULL ) {
 			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
 			   "\t\tzero values" ));
-		} else if ( tmp->ml_bvalues[1] == NULL ) {
+		} else if ( tmp->sml_bvalues[1].bv_val == NULL ) {
 			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
 			   "\t\tone value" ));
 		} else {
@@ -249,19 +256,19 @@ do_modify(
 
 #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->ml_bvalues == NULL ) {
+		if ( tmp->sml_bvalues == NULL ) {
 			Debug( LDAP_DEBUG_ARGS, "%s\n",
 			   "\t\tno values", NULL, NULL );
-		} else if ( tmp->ml_bvalues[0] == NULL ) {
+		} else if ( tmp->sml_bvalues[0].bv_val == NULL ) {
 			Debug( LDAP_DEBUG_ARGS, "%s\n",
 			   "\t\tzero values", NULL, NULL );
-		} else if ( tmp->ml_bvalues[1] == NULL ) {
+		} else if ( tmp->sml_bvalues[1].bv_val == NULL ) {
 			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_bvalues[0].bv_len, NULL );
 		} else {
 			Debug( LDAP_DEBUG_ARGS, "%s\n",
 			   "\t\tmultiple values", NULL, NULL );
@@ -271,7 +278,7 @@ do_modify(
 #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 );
 
@@ -280,14 +287,14 @@ do_modify(
 	 * appropriate one, or send a referral to our "referral server"
 	 * if we don't hold it.
 	 */
-	if ( (be = select_backend( ndn, manageDSAit )) == NULL ) {
-		struct berval **ref = referral_rewrite( default_referral,
-			NULL, dn, LDAP_SCOPE_DEFAULT );
+	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, ref ? ref : default_referral, NULL );
 
-		ber_bvecfree( ref );
+		ber_bvarray_free( ref );
 		goto cleanup;
 	}
 
@@ -300,13 +307,13 @@ do_modify(
 	}
 
 	/* check for referrals */
-	rc = backend_check_referrals( be, conn, op, dn, ndn );
+	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)
@@ -316,20 +323,20 @@ do_modify(
 	 */
 	if ( be->be_modify ) {
 		/* do the update here */
-		int repl_user = be_isupdate( be, op->o_ndn );
+		int repl_user = be_isupdate( be, &op->o_ndn );
 #ifndef SLAPD_MULTIMASTER
 		/* Multimaster slapd does not have to check for replicator dn
 		 * because it accepts each modify request
 		 */
-		if ( be->be_update_ndn == NULL || repl_user )
+		if ( !be->be_update_ndn.bv_len || repl_user )
 #endif
 		{
-			int update = be->be_update_ndn != NULL;
+			int update = be->be_update_ndn.bv_len;
 			const char *text;
 			char textbuf[SLAP_TEXT_BUFLEN];
 			size_t textlen = sizeof textbuf;
 
-			rc = slap_modlist2mods( modlist, update, &mods, &text,
+			rc = slap_mods_check( modlist, update, &text,
 				textbuf, textlen );
 
 			if( rc != LDAP_SUCCESS ) {
@@ -338,18 +345,16 @@ do_modify(
 				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 )
+			if ( SLAP_LASTMOD(be) && !repl_user ) {
+				for( modtail = &modlist;
+					*modtail != NULL;
+					modtail = &(*modtail)->sml_next )
 				{
 					/* empty */
 				}
-				rc = slap_mods_opattrs( op, modstail, &text );
 
+				rc = slap_mods_opattrs( op, modlist, modtail, &text,
+					textbuf, textlen );
 				if( rc != LDAP_SUCCESS ) {
 					send_ldap_result( conn, op, rc,
 						NULL, text,
@@ -358,91 +363,77 @@ 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
 				&& !repl_user
 #endif
 			) {
 				/* but we log only the ones not from a replicator user */
-				replog( be, op, dn, ndn, mods );
+				replog( be, op, &pdn, &ndn, modlist );
 			}
 
 #ifndef SLAPD_MULTIMASTER
 		/* send a referral */
 		} else {
-			struct berval **defref = be->be_update_refs
+			BerVarray defref = be->be_update_refs
 				? be->be_update_refs : default_referral;
-			struct berval **ref = referral_rewrite( defref,
-				NULL, dn, LDAP_SCOPE_DEFAULT );
+			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_bvecfree( ref );
+			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;
 }
 
 /*
- * 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,
 	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) );
-
-		/* copy the op */
-		mod->sml_op = ml->ml_op;
-
 		/* convert to attribute description */
-		rc = slap_str2ad( ml->ml_type, &mod->sml_desc, 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->ml_type, *text );
+				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;
 		}
@@ -451,35 +442,32 @@ int slap_modlist2mods(
 			&& slap_ad_is_binary( ad ))
 		{
 			/* attribute requires binary transfer */
-			slap_mods_free( mod );
 			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 );
 			snprintf( textbuf, textlen,
 				"%s: no user modification allowed",
-				ml->ml_type );
+				ml->sml_type.bv_val );
 			*text = textbuf;
 			return LDAP_CONSTRAINT_VIOLATION;
 		}
 
 		if ( is_at_obsolete( ad->ad_type ) &&
-			( mod->sml_op == LDAP_MOD_ADD || ml->ml_bvalues != NULL ) )
+			( ml->sml_op == LDAP_MOD_ADD || ml->sml_bvalues != 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;
 		}
@@ -487,7 +475,7 @@ int slap_modlist2mods(
 		/*
 		 * 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;
@@ -495,11 +483,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;
@@ -509,29 +496,27 @@ 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;
+			for( nvals = 0; ml->sml_bvalues[nvals].bv_val; nvals++ ) {
+				struct berval pval;
 				if( pretty ) {
 					rc = pretty( ad->ad_type->sat_syntax,
-						ml->ml_bvalues[nvals], &pval );
+						&ml->sml_bvalues[nvals], &pval );
 				} else {
 					rc = validate( ad->ad_type->sat_syntax,
-						ml->ml_bvalues[nvals] );
+						&ml->sml_bvalues[nvals] );
 				}
 
 				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( ml->sml_bvalues[nvals].bv_val );
+					ml->sml_bvalues[nvals] = pval;
 				}
 			}
 
@@ -539,23 +524,16 @@ int slap_modlist2mods(
 			 * 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 );
+					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;
@@ -563,8 +541,10 @@ int slap_modlist2mods(
 
 int slap_mods_opattrs(
 	Operation *op,
+	Modifications *mods,
 	Modifications **modtail,
-	const char **text )
+	const char **text,
+	char *textbuf, size_t textlen )
 {
 	struct berval name, timestamp, csn;
 	time_t now = slap_get_time();
@@ -590,82 +570,106 @@ int slap_mods_opattrs(
 	timestamp.bv_val = timebuf;
 	timestamp.bv_len = strlen(timebuf);
 
-	if( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
+	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 ) {
-		struct berval uuid;
+		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;
+		}
 
-		uuid.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
-		uuid.bv_val = uuidbuf;
+		tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
+		tmpval.bv_val = uuidbuf;
 		
-		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_entryUUID;
-		mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
-		mod->sml_bvalues[0] = ber_bvdup( &uuid );
-		mod->sml_bvalues[1] = NULL;
-		assert( mod->sml_bvalues[0] );
+		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_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_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] );
+		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;
-		assert( mod->sml_bvalues[0] );
+		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 = (struct berval **) malloc( 2 * sizeof(struct berval *) );
-	mod->sml_bvalues[0] = ber_bvdup( &csn );
-	mod->sml_bvalues[1] = NULL;
-	assert( mod->sml_bvalues[0] );
+	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_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_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] );
+	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;
-	assert( mod->sml_bvalues[0] );
+	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;
 
+	*modtail = NULL;
+
 	return LDAP_SUCCESS;
 }
-