X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=03c8fc000d2a05868296e66163776c4e26802d6b;hb=2d68ec09f2692fa4832e274fb026641be1ea3bc7;hp=1f155f52236e91ff2d1cb18ce66e6e1b95a18769;hpb=ffc343a485eb76e7986ccbcb3433c5d0cb8b6be5;p=openldap

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 1f155f5223..03c8fc000d 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -24,10 +24,17 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+static void initAddPlugin( Operation *op,
+	struct berval *dn, Entry *e, int manageDSAit );
+static int doPreAddPluginFNs( Operation *op );
+static void doPostAddPluginFNs( Operation *op );
+#endif /* LDAP_SLAPI */
 
 int
-do_add( Connection *conn, Operation *op )
+do_add( Operation *op, SlapReply *rs )
 {
 	BerElement	*ber = op->o_ber;
 	char		*last;
@@ -35,20 +42,13 @@ do_add( Connection *conn, Operation *op )
 	ber_len_t	len;
 	ber_tag_t	tag;
 	Entry		*e;
-	Backend		*be;
 	Modifications	*modlist = NULL;
 	Modifications	**modtail = &modlist;
-	Modifications	tmp, *mod;
-	const char *text;
-	LDAPRDN		*rdn = NULL;
-	int		cnt;
-	int			rc = LDAP_SUCCESS;
+	Modifications	tmp;
 	int	manageDSAit;
 
-	Slapi_PBlock *pb = op->o_pb;
-
 #ifdef NEW_LOGGING
-	LDAP_LOG( OPERATION, ENTRY, "do_add: conn %d enter\n", conn->c_connid,0,0 );
+	LDAP_LOG( OPERATION, ENTRY, "do_add: conn %d enter\n", op->o_connid,0,0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
 #endif
@@ -68,38 +68,39 @@ do_add( Connection *conn, Operation *op )
 	if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR, 
-			"do_add: conn %d ber_scanf failed\n", conn->c_connid,0,0 );
+			"do_add: conn %d ber_scanf failed\n", op->o_connid,0,0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_add: 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 -1;
 	}
 
 	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
-	rc = dnPrettyNormal( NULL, &dn, &e->e_name, &e->e_nname );
+	rs->sr_err = dnPrettyNormal( NULL, &dn, &e->e_name, &e->e_nname );
 
-	if( rc != LDAP_SUCCESS ) {
+	if( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR, 
-			"do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn.bv_val, 0 );
+			"do_add: conn %d invalid dn (%s)\n", op->o_connid, dn.bv_val, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_add: 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 done;
 	}
 
 #ifdef NEW_LOGGING
 	LDAP_LOG( OPERATION, ARGS, 
-		"do_add: conn %d  dn (%s)\n", conn->c_connid, e->e_dn, 0 );
+		"do_add: conn %d  dn (%s)\n", op->o_connid, e->e_dn, 0 );
 #else
 	Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", e->e_dn, 0, 0 );
 #endif
 
+	op->o_req_dn = e->e_name;
+	op->o_req_ndn = e->e_nname;
+
 	/* get the attrs */
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
 	    tag = ber_next_element( ber, &len, last ) )
@@ -107,41 +108,46 @@ do_add( Connection *conn, Operation *op )
 		Modifications *mod;
 		ber_tag_t rtag;
 
-		rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_bvalues );
+#ifdef SLAP_NVALUES
+		tmp.sml_nvalues = NULL;
+#endif
+
+		rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_values );
 
 		if ( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG( OPERATION, ERR, 
-				   "do_add: conn %d	 decoding error \n", conn->c_connid, 0, 0 );
+				   "do_add: conn %d	 decoding error \n", op->o_connid, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
 #endif
-			send_ldap_disconnect( conn, op,
-				LDAP_PROTOCOL_ERROR, "decoding error" );
-			rc = -1;
+			send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+			rs->sr_err = -1;
 			goto done;
 		}
 
-		if ( tmp.sml_bvalues == NULL ) {
+		if ( tmp.sml_values == NULL ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG( OPERATION, INFO, 
 				"do_add: conn %d	 no values for type %s\n",
-				conn->c_connid, tmp.sml_type.bv_val, 0 );
+				op->o_connid, tmp.sml_type.bv_val, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
 				tmp.sml_type.bv_val, 0, 0 );
 #endif
-			send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
-				NULL, "no values for attribute type", NULL, NULL );
+			send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, "no values for attribute type" );
 			goto done;
 		}
+
 		mod  = (Modifications *) ch_malloc( sizeof(Modifications) );
-		
 		mod->sml_op = LDAP_MOD_ADD;
 		mod->sml_next = NULL;
 		mod->sml_desc = NULL;
 		mod->sml_type = tmp.sml_type;
-		mod->sml_bvalues = tmp.sml_bvalues;
+		mod->sml_values = tmp.sml_values;
+#ifdef SLAP_NVALUES
+		mod->sml_nvalues = NULL;
+#endif
 
 		*modtail = mod;
 		modtail = &mod->sml_next;
@@ -150,20 +156,19 @@ do_add( Connection *conn, Operation *op )
 	if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR, 
-			"do_add: conn %d ber_scanf failed\n", conn->c_connid, 0, 0 );
+			"do_add: conn %d ber_scanf failed\n", op->o_connid, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
-		send_ldap_disconnect( conn, op,
-			LDAP_PROTOCOL_ERROR, "decoding error" );
-		rc = -1;
+		send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+		rs->sr_err = -1;
 		goto done;
 	}
 
-	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+	if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, INFO, 
-			"do_add: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 );
+			"do_add: conn %d get_ctrls failed\n", op->o_connid, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
 #endif
@@ -171,219 +176,23 @@ do_add( Connection *conn, Operation *op )
 	} 
 
 	if ( modlist == NULL ) {
-		send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
-			NULL, "no attributes provided", NULL, NULL );
+		send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, "no attributes provided" );
 		goto done;
 	}
 
 	Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu ADD dn=\"%s\"\n",
-	    op->o_connid, op->o_opid, e->e_dn, 0, 0 );
+	    op->o_connid, op->o_opid, e->e_name.bv_val, 0, 0 );
 
 	if( e->e_nname.bv_len == 0 ) {
 		/* protocolError may be a more appropriate error */
-		send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
-			NULL, "root DSE already exists",
-			NULL, NULL );
+		send_ldap_error( op, rs, LDAP_ALREADY_EXISTS, "root DSE already exists" );
 		goto done;
 
 	} else if ( bvmatch( &e->e_nname, &global_schemandn ) ) {
-		send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
-			NULL, "subschema subentry already exists",
-			NULL, NULL );
-		goto done;
-	}
-
-	/*
-	 * is objectClass special?
-	 */
-
-	/* look for objectClass attribute */
-	for ( mod = modlist; mod; mod = mod->sml_next ) {
-		AttributeDescription	*mod_desc = NULL;
-
-		rc = slap_bv2ad( &mod->sml_type, &mod_desc, &text );
-		if ( rc != LDAP_SUCCESS ) {
-			send_ldap_result( conn, op, rc,
-					NULL, text, NULL, NULL );
-			goto done;
-		}
-
-		if ( mod_desc == slap_schema.si_ad_objectClass ) {
-			break;
-		}
-	}
-
-	if ( mod == NULL ) {
-		send_ldap_result( conn, op, 
-				rc = LDAP_OBJECT_CLASS_VIOLATION,
-				NULL, "objectClass missing", 
-				NULL, NULL );
+		send_ldap_error( op, rs, LDAP_ALREADY_EXISTS, "subschema subentry already exists" );
 		goto done;
 	}
 
-	/* look for special objectClass */
-	for ( cnt = 0; mod->sml_bvalues[ cnt ].bv_val; cnt++ ) {
-		ObjectClass	*oc;
-
-		oc = oc_bvfind( &mod->sml_bvalues[ cnt ] );
-
-		if ( oc == NULL ) {
-			send_ldap_result( conn, op, 
-					rc = LDAP_OBJECT_CLASS_VIOLATION,
-					NULL, "undefined objectClass", 
-					NULL, NULL );
-			goto done;
-		}
-
-		/* check for special objectClass */
-		if ( oc == slap_schema.si_oc_alias ) {
-			break;
-		}
-
-		if ( oc == slap_schema.si_oc_referral ) {
-			break;
-		}
-
-		if ( oc == slap_schema.si_oc_extensibleObject ) {
-			break;
-		}
-	}
-
-	/*
-	 * if not special
-	 */
-	if ( mod->sml_bvalues[ cnt ].bv_val == NULL ) {
-
-		/*
-		 * Get attribute type(s) and attribute value(s) of our rdn,
-		 */
-		if ( ldap_bv2rdn( &e->e_name, &rdn, (char **)&text,
-			LDAP_DN_FORMAT_LDAP ) )
-		{
-			send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX,
-				NULL, "unknown type(s) used in RDN",
-				NULL, NULL );
-			goto done;
-		}
-
-		/* Check for RDN attrs in entry */
-		for ( cnt = 0; rdn[ 0 ][ cnt ]; cnt++ ) {
-			AttributeDescription	*desc = NULL;
-			MatchingRule		*mr;
-			int			i;
-	
-			rc = slap_bv2ad( &rdn[ 0 ][ cnt ]->la_attr, 
-					&desc, &text );
-	
-			if ( rc != LDAP_SUCCESS ) {
-				send_ldap_result( conn, op, rc,
-						NULL, text, NULL, NULL );
-				goto done;
-			}
-	
-			for (mod = modlist; mod; mod = mod->sml_next) {
-				AttributeDescription	*mod_desc = NULL;
-	
-				rc = slap_bv2ad( &mod->sml_type, 
-						&mod_desc, &text );
-				if ( rc != LDAP_SUCCESS ) {
-					send_ldap_result( conn, op, rc,
-							NULL, text, NULL, NULL );
-					goto done;
-				}
-	
-				if (mod_desc == desc) {
-					break;
-				}
-			}
-	
-			if (mod == NULL) {
-				struct berval	bv;
-	
-#define BAILOUT
-#ifdef BAILOUT
-				/* bail out */
-				send_ldap_result( conn, op, 
-						rc = LDAP_NO_SUCH_ATTRIBUTE,
-						NULL,
-						"attribute in RDN not listed in entry", 
-						NULL, NULL );
-				goto done;
-	
-#else /* ! BAILOUT */
-				/* add attribute type and value to modlist */
-				mod  = (Modifications *) ch_malloc( sizeof(Modifications) );
-			
-				mod->sml_op = LDAP_MOD_ADD;
-				mod->sml_next = NULL;
-				mod->sml_desc = NULL;
-	
-				ber_dupbv( &mod->sml_type,
-						&rdn[ 0 ][ cnt ]->la_attr );
-	
-				mod->sml_bvalues = NULL;
-				ber_dupbv( &bv, &rdn[ 0 ][ cnt ]->la_value );
-				ber_bvarray_add( &mod->sml_bvalues, &bv );
-	
-				*modtail = mod;
-				modtail = &mod->sml_next;
-				continue;
-#endif /* ! BAILOUT */
-			}
-	
-			mr = desc->ad_type->sat_equality;
-			if (mr == NULL || !mr->smr_match ) {
-				/* bail out */
-				send_ldap_result( conn, op, 
-						rc = LDAP_INVALID_SYNTAX,
-						NULL,
-						"attribute in RDN lacks matching rule", 
-						NULL, NULL );
-				goto done;
-			}
-	
-			for (i = 0; mod->sml_bvalues[ i ].bv_val; i++) {
-				int		match = 0;
-				
-				rc = value_match(&match, desc, mr,
-						SLAP_MR_VALUE_SYNTAX_MATCH,
-						&mod->sml_bvalues[ i ],
-						&rdn[ 0 ][ cnt ]->la_value, &text);
-	
-				if ( rc != LDAP_SUCCESS ) {
-					send_ldap_result( conn, op, rc,
-							NULL, text, NULL, NULL);
-					goto done;
-				}
-	
-				if (match == 0) {
-					break;
-				}
-			}
-	
-			/* not found? */
-			if (mod->sml_bvalues[ i ].bv_val == NULL) {
-#ifdef BAILOUT
-				/* bailout */
-				send_ldap_result( conn, op, 
-						rc = LDAP_NO_SUCH_ATTRIBUTE,
-						NULL,
-						"value in RDN not listed in entry", 
-						NULL, NULL );
-				goto done;
-	
-#else /* ! BAILOUT */
-				struct berval	bv;
-	
-				/* add attribute type and value to modlist */
-				ber_dupbv( &bv, &rdn[ 0 ][ cnt ]->la_value );
-				ber_bvarray_add( &mod->sml_bvalues, &bv );
-				continue;
-#endif /* ! BAILOUT */
-			}
-		}
-	}
-
 	manageDSAit = get_manageDSAit( op );
 
 	/*
@@ -391,58 +200,33 @@ do_add( Connection *conn, Operation *op )
 	 * appropriate one, or send a referral to our "referral server"
 	 * if we don't hold it.
 	 */
-	be = select_backend( &e->e_nname, manageDSAit, 0 );
-	if ( be == NULL ) {
-		BerVarray ref = referral_rewrite( default_referral,
+	op->o_bd = select_backend( &e->e_nname, manageDSAit, 0 );
+	if ( op->o_bd == NULL ) {
+		rs->sr_ref = referral_rewrite( default_referral,
 			NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
 
-		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-			NULL, NULL, ref ? ref : default_referral, NULL );
+		rs->sr_err = LDAP_REFERRAL;
+		if (!rs->sr_ref) rs->sr_ref = default_referral;
+		send_ldap_result( op, rs );
 
-		if ( ref ) ber_bvarray_free( ref );
+		if ( rs->sr_ref != default_referral ) ber_bvarray_free( rs->sr_ref );
 		goto done;
 	}
 
 	/* 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 done;
 	}
 
 	/* check for referrals */
-	rc = backend_check_referrals( be, conn, op, &e->e_name, &e->e_nname );
-	if ( rc != LDAP_SUCCESS ) {
+	if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
 		goto done;
 	}
 
-#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_ADD_ENTRY, (void *)e );
-	slapi_pblock_set( pb, SLAPI_ADD_TARGET, (void *)dn.bv_val );
-	slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
-
-	rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_ADD_FN, pb );
-	if ( rc != 0 ) {
-		/*
-		 * A preoperation plugin failure will abort the
-		 * entire operation.
-		 */
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, INFO, "do_add: add preoperation plugin failed\n",
-				0, 0, 0);
-#else
-		Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
-				0, 0, 0);
-		if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
-			rc = LDAP_OTHER;
-		goto done;
-#endif
-	}
-#endif /* defined( LDAP_SLAPI ) */
+#ifdef LDAP_SLAPI
+	initAddPlugin( op, &dn, e, manageDSAit );
+#endif /* LDAP_SLAPI */
 
 	/*
 	 * do the add if 1 && (2 || 3)
@@ -450,23 +234,22 @@ do_add( Connection *conn, Operation *op )
 	 * 2) this backend is master for what it holds;
 	 * 3) it's a replica and the dn supplied is the updatedn.
 	 */
-	if ( be->be_add ) {
+	if ( op->o_bd->be_add ) {
 		/* do the update here */
-		int repl_user = be_isupdate(be, &op->o_ndn );
+		int repl_user = be_isupdate(op->o_bd, &op->o_ndn );
 #ifndef SLAPD_MULTIMASTER
-		if ( !be->be_update_ndn.bv_len || repl_user )
+		if ( !op->o_bd->be_update_ndn.bv_len || repl_user )
 #endif
 		{
-			int update = be->be_update_ndn.bv_len;
+			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,
+			rs->sr_err = slap_mods_check( modlist, update, &rs->sr_text,
 				textbuf, textlen );
 
-			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 done;
 			}
 
@@ -478,73 +261,94 @@ do_add( Connection *conn, Operation *op )
 					assert( (*modtail)->sml_op == LDAP_MOD_ADD );
 					assert( (*modtail)->sml_desc != NULL );
 				}
-				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 done;
 				}
 			}
 
-			rc = slap_mods2entry( modlist, &e, repl_user, &text,
+			rs->sr_err = slap_mods2entry( modlist, &e, repl_user, &rs->sr_text,
 				textbuf, textlen );
-			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 done;
 			}
 
-			if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
+#ifdef LDAP_SLAPI
+			/*
+			 * Call the preoperation plugin here, because the entry
+			 * will actually contain something.
+			 */
+			rs->sr_err = doPreAddPluginFNs( op );
+			if ( rs->sr_err != LDAP_SUCCESS ) {
+				/* plugin will have sent result */
+				goto done;
+			}
+#endif /* LDAP_SLAPI */
+
+			op->ora_e = e;
+			if ( (op->o_bd->be_add)( op, rs ) == 0 ) {
 #ifdef SLAPD_MULTIMASTER
 				if ( !repl_user )
 #endif
 				{
-					replog( be, op, &e->e_name, &e->e_nname, e );
+					replog( op );
 				}
-				be_entry_release_w( be, conn, op, e );
+				be_entry_release_w( op, e );
 				e = NULL;
 			}
 
 #ifndef SLAPD_MULTIMASTER
 		} else {
-			BerVarray defref = be->be_update_refs
-				? be->be_update_refs : default_referral;
-			BerVarray ref = referral_rewrite( defref,
+			BerVarray defref;
+			BerVarray ref;
+#ifdef LDAP_SLAPI
+			/*
+			 * SLAPI_ADD_ENTRY will be empty, but this may be acceptable
+			 * on replicas (for now, it involves the minimum code intrusion).
+			 */
+			rs->sr_err = doPreAddPluginFNs( op );
+			if ( rs->sr_err != LDAP_SUCCESS ) {
+				/* plugin will have sent result */
+				goto done;
+			}
+#endif /* LDAP_SLAPI */
+
+			defref = op->o_bd->be_update_refs
+				? op->o_bd->be_update_refs : default_referral;
+			rs->sr_ref = referral_rewrite( defref,
 				NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
 
-			send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
-				ref ? ref : defref, NULL );
+			rs->sr_err = LDAP_REFERRAL;
+			if (!rs->sr_ref) rs->sr_ref = default_referral;
+			send_ldap_result( op, rs );
 
-			if ( ref ) ber_bvarray_free( ref );
-#endif
+			if ( rs->sr_ref != default_referral ) ber_bvarray_free( rs->sr_ref );
+#endif /* SLAPD_MULTIMASTER */
 		}
 	} else {
+#ifdef LDAP_SLAPI
+	    rs->sr_err = doPreAddPluginFNs( op );
+	    if ( rs->sr_err != LDAP_SUCCESS ) {
+		/* plugin will have sent result */
+		goto done;
+	    }
+#endif
 #ifdef NEW_LOGGING
 	    LDAP_LOG( OPERATION, INFO, 
-		       "do_add: conn %d	 no backend support\n", conn->c_connid, 0, 0 );
+		       "do_add: conn %d	 no backend support\n", op->o_connid, 0, 0 );
 #else
 	    Debug( LDAP_DEBUG_ARGS, "	 do_add: no backend support\n", 0, 0, 0 );
 #endif
-	    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 )
-	/*
-	 * Postoperation errors are silently ignored; the work has
-	 * been done.
-	 */
-	if ( doPluginFNs( be, SLAPI_PLUGIN_POST_ADD_FN, pb ) != 0) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, INFO, "do_add: Add postoperation plugins failed\n",
-				0, 0, 0);
-#else
-		Debug(LDAP_DEBUG_TRACE, "do_add: Add postoperation plugins failed.\n",
-				0, 0, 0);
-#endif
-	}
-#endif /* defined( LDAP_SLAPI ) */
+#ifdef LDAP_SLAPI
+	doPostAddPluginFNs( op );
+#endif /* LDAP_SLAPI */
 
 done:
 	if( modlist != NULL ) {
@@ -554,7 +358,7 @@ done:
 		entry_free( e );
 	}
 
-	return rc;
+	return rs->sr_err;
 }
 
 int
@@ -593,7 +397,7 @@ slap_mods2entry(
 			for( i=0; attr->a_vals[i].bv_val; i++ ) {
 				/* count them */
 			}
-			for( j=0; mods->sml_bvalues[j].bv_val; j++ ) {
+			for( j=0; mods->sml_values[j].bv_val; j++ ) {
 				/* count them */
 			}
 			j++;	/* NULL */
@@ -603,12 +407,28 @@ slap_mods2entry(
 
 			/* should check for duplicates */
 
-			AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
+			AC_MEMCPY( &attr->a_vals[i], mods->sml_values,
 				sizeof( struct berval ) * j );
 
 			/* trim the mods array */
-			ch_free( mods->sml_bvalues );
-			mods->sml_bvalues = NULL;
+			ch_free( mods->sml_values );
+			mods->sml_values = NULL;
+
+#ifdef SLAP_NVALUES
+			if( mods->sml_nvalues ) {
+				attr->a_nvals = ch_realloc( attr->a_nvals,
+					sizeof( struct berval ) * (i+j) );
+
+				AC_MEMCPY( &attr->a_nvals[i], mods->sml_nvalues,
+					sizeof( struct berval ) * j );
+
+				/* trim the mods array */
+				ch_free( mods->sml_nvalues );
+				mods->sml_nvalues = NULL;
+			} else {
+				attr->a_nvals = attr->a_vals;
+			}
+#endif
 
 			continue;
 #else
@@ -619,7 +439,7 @@ slap_mods2entry(
 #endif
 		}
 
-		if( mods->sml_bvalues[1].bv_val != NULL ) {
+		if( mods->sml_values[1].bv_val != NULL ) {
 			/* check for duplicates */
 			int		i, j;
 			MatchingRule *mr = mods->sml_desc->ad_type->sat_equality;
@@ -642,13 +462,31 @@ slap_mods2entry(
 
 			} else {
 				int		rc;
-				const char	*text = NULL;
-				char		textbuf[ SLAP_TEXT_BUFLEN ]  = { '\0' };
-				
+#ifdef SLAP_NVALUES
+				int match;
+
+				for ( i = 0; mods->sml_nvalues[i].bv_val != NULL; i++ ) {
+					/* test asserted values against themselves */
+					for( j = 0; j < i; j++ ) {
+						rc = value_match( &match, mods->sml_desc, mr,
+							SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX
+							| SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
+							| SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
+							&mods->sml_nvalues[i], &mods->sml_nvalues[j], text );
+						if ( rc == LDAP_SUCCESS && match == 0 ) {
+							/* value exists already */
+							snprintf( textbuf, textlen,
+								"%s: value #%d provided more than once",
+								mods->sml_desc->ad_cname.bv_val, j );
+							return LDAP_TYPE_OR_VALUE_EXISTS;
+						}
+					}
+				}
+#else
 				rc = modify_check_duplicates( mods->sml_desc, mr,
 						NULL, mods->sml_bvalues, 0,
-						&text, textbuf, sizeof( textbuf ) );
-
+						text, textbuf, textlen );
+#endif
 				if ( rc != LDAP_SUCCESS ) {
 					return rc;
 				}
@@ -663,8 +501,17 @@ slap_mods2entry(
 
 		/* move values to attr structure */
 		/*	should check for duplicates */
-		attr->a_vals = mods->sml_bvalues;
-		mods->sml_bvalues = NULL;
+		attr->a_vals = mods->sml_values;
+		mods->sml_values = NULL;
+
+#ifdef SLAP_NVALUES
+		if ( mods->sml_nvalues ) {
+			attr->a_nvals = mods->sml_nvalues;
+			mods->sml_nvalues = NULL;
+		} else {
+			attr->a_nvals = attr->a_vals;
+		}
+#endif
 
 		*tail = attr;
 		tail = &attr->a_next;
@@ -673,3 +520,55 @@ slap_mods2entry(
 	return LDAP_SUCCESS;
 }
 
+#ifdef LDAP_SLAPI
+static void initAddPlugin( Operation *op,
+	struct berval *dn, Entry *e, int manageDSAit )
+{
+	slapi_x_pblock_set_operation( op->o_pb, op );
+	slapi_pblock_set( op->o_pb, SLAPI_ADD_TARGET, (void *)dn->bv_val );
+	slapi_pblock_set( op->o_pb, SLAPI_ADD_ENTRY, (void *)e );
+	slapi_pblock_set( op->o_pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
+}
+
+static int doPreAddPluginFNs( Operation *op )
+{
+	int rc;
+
+	rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_ADD_FN, op->o_pb );
+	if ( rc != 0 ) {
+		/*
+		 * A preoperation plugin failure will abort the
+		 * entire operation.
+		 */
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, INFO, "do_add: add preoperation plugin failed\n",
+				0, 0, 0);
+#else
+		Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
+				0, 0, 0);
+		if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
+			rc = LDAP_OTHER;
+#endif
+	} else {
+		rc = LDAP_SUCCESS;
+	}
+
+	return rc;
+}
+
+static void doPostAddPluginFNs( Operation *op )
+{
+	int rc;
+
+	rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb );
+	if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, INFO, "do_add: add postoperation plugin failed\n",
+				0, 0, 0);
+#else
+		Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
+				0, 0, 0);
+#endif
+	}
+}
+#endif /* LDAP_SLAPI */