X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=4058b43ebab4471bbaf0858f640a0610683b6df8;hb=b0b3eff457f0e431c4fd094d3d9cfeb6383df91d;hp=92e7a86804f2d12d55611c3e849f9b5d1485cbd3;hpb=7087a8f58d4e6239b88d1dc5e56bf06e77572351;p=openldap

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 92e7a86804..4058b43eba 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.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
@@ -231,7 +239,7 @@ do_add( Operation *op, SlapReply *rs )
 	}
 
 #ifdef LDAP_SLAPI
-	initAddPlugin( op, &dn, e, manageDSAit );
+	if ( op->o_pb ) initAddPlugin( op, &dn, e, manageDSAit );
 #endif /* LDAP_SLAPI */
 
 	/*
@@ -243,13 +251,11 @@ do_add( Operation *op, SlapReply *rs )
 	if ( op->o_bd->be_add ) {
 		/* do the update here */
 		int repl_user = be_isupdate(op->o_bd, &op->o_ndn );
-#if defined(LDAP_SYNCREPL) && !defined(SLAPD_MULTIMASTER)
-		if ( !op->o_bd->syncinfo &&
-						( !op->o_bd->be_update_ndn.bv_len || repl_user ))
-#elif defined(LDAP_SYNCREPL) && defined(SLAPD_MULTIMASTER)
-		if ( !op->o_bd->syncinfo )	/* LDAP_SYNCREPL overrides MM */
-#elif !defined(LDAP_SYNCREPL) && !defined(SLAPD_MULTIMASTER)
-		if ( !op->o_bd->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 = op->o_bd->be_update_ndn.bv_len;
@@ -280,8 +286,8 @@ do_add( Operation *op, SlapReply *rs )
 				}
 			}
 
-			rs->sr_err = slap_mods2entry( modlist, &e, repl_user, &rs->sr_text,
-				textbuf, textlen );
+			rs->sr_err = slap_mods2entry( modlist, &e, repl_user, 0,
+									&rs->sr_text, textbuf, textlen );
 			if( rs->sr_err != LDAP_SUCCESS ) {
 				send_ldap_result( op, rs );
 				goto done;
@@ -292,10 +298,12 @@ do_add( Operation *op, SlapReply *rs )
 			 * 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;
+			if ( op->o_pb ) {
+				rs->sr_err = doPreAddPluginFNs( op );
+				if ( rs->sr_err != LDAP_SUCCESS ) {
+					/* plugin will have sent result */
+					goto done;
+				}
 			}
 #endif /* LDAP_SLAPI */
 
@@ -311,7 +319,7 @@ do_add( Operation *op, SlapReply *rs )
 				e = NULL;
 			}
 
-#if defined(LDAP_SYNCREPL) || !defined(SLAPD_MULTIMASTER)
+#ifndef SLAPD_MULTIMASTER
 		} else {
 			BerVarray defref = NULL;
 #ifdef LDAP_SLAPI
@@ -319,21 +327,25 @@ do_add( Operation *op, SlapReply *rs )
 			 * 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;
+			if ( op->o_pb ) {
+				rs->sr_err = doPreAddPluginFNs( op );
+				if ( rs->sr_err != LDAP_SUCCESS ) {
+					/* plugin will have sent result */
+					goto done;
+				}
 			}
 #endif /* LDAP_SLAPI */
 
-#ifdef LDAP_SYNCREPL
-			if ( op->o_bd->syncinfo ) {
-				defref = op->o_bd->syncinfo->masteruri_bv;
-			} else
-#endif
-			{
+			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;
+					? op->o_bd->be_update_refs : default_referral;
 			}
 
 			if ( defref != NULL ) {
@@ -354,10 +366,12 @@ do_add( Operation *op, SlapReply *rs )
 		}
 	} else {
 #ifdef LDAP_SLAPI
-	    rs->sr_err = doPreAddPluginFNs( op );
-	    if ( rs->sr_err != LDAP_SUCCESS ) {
-			/* plugin will have sent result */
-			goto done;
+		if ( op->o_pb ) {
+			rs->sr_err = doPreAddPluginFNs( op );
+			if ( rs->sr_err != LDAP_SUCCESS ) {
+				/* plugin will have sent result */
+				goto done;
+			}
 		}
 #endif
 #ifdef NEW_LOGGING
@@ -371,10 +385,13 @@ do_add( Operation *op, SlapReply *rs )
 	}
 
 #ifdef LDAP_SLAPI
-	doPostAddPluginFNs( op );
+	if ( op->o_pb ) doPostAddPluginFNs( op );
 #endif /* LDAP_SLAPI */
 
 done:
+
+	slap_graduate_commit_csn( op );
+
 	if( modlist != NULL ) {
 		slap_mods_free( modlist );
 	}
@@ -392,6 +409,7 @@ slap_mods2entry(
 	Modifications *mods,
 	Entry **e,
 	int repl_user,
+	int dup,
 	const char **text,
 	char *textbuf, size_t textlen )
 {
@@ -403,7 +421,9 @@ slap_mods2entry(
 	for( ; mods != NULL; mods = mods->sml_next ) {
 		Attribute *attr;
 
-		assert( mods->sml_op == LDAP_MOD_ADD );
+		if ( !repl_user ) {
+			assert( mods->sml_op == LDAP_MOD_ADD );
+		}
 		assert( mods->sml_desc != NULL );
 
 		attr = attr_find( (*e)->e_attrs, mods->sml_desc );
@@ -522,16 +542,37 @@ slap_mods2entry(
 
 		/* move ad to attr structure */
 		attr->a_desc = mods->sml_desc;
-		mods->sml_desc = NULL;
+		if ( !dup )
+			mods->sml_desc = NULL;
 
 		/* move values to attr structure */
 		/*	should check for duplicates */
-		attr->a_vals = mods->sml_values;
-		mods->sml_values = NULL;
+		if ( dup ) { 
+			int i;
+			for ( i = 0; mods->sml_values[i].bv_val; i++ ) ;
+			attr->a_vals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
+			for ( i = 0; mods->sml_values[i].bv_val; i++ )
+				ber_dupbv( &attr->a_vals[i], &mods->sml_values[i] );
+			attr->a_vals[i].bv_len = 0;
+			attr->a_vals[i].bv_val = NULL;
+		} else {
+			attr->a_vals = mods->sml_values;
+			mods->sml_values = NULL;
+		}
 
 		if ( mods->sml_nvalues ) {
-			attr->a_nvals = mods->sml_nvalues;
-			mods->sml_nvalues = NULL;
+			if ( dup ) {
+				int i;
+				for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) ;
+				attr->a_nvals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
+				for ( i = 0; mods->sml_nvalues[i].bv_val; i++ )
+					ber_dupbv( &attr->a_nvals[i], &mods->sml_nvalues[i] );
+				attr->a_nvals[i].bv_len = 0;
+				attr->a_nvals[i].bv_val = NULL;
+			} else {
+				attr->a_nvals = mods->sml_nvalues;
+				mods->sml_nvalues = NULL;
+			}
 		} else {
 			attr->a_nvals = attr->a_vals;
 		}
@@ -543,6 +584,73 @@ slap_mods2entry(
 	return LDAP_SUCCESS;
 }
 
+int
+slap_entry2mods(
+	Entry *e,
+	Modifications **mods,
+	const char **text,
+	char *textbuf, size_t textlen )
+{
+	Modifications	*modhead = NULL;
+	Modifications	*mod;
+	Modifications	**modtail = &modhead;
+	Attribute		*a_new;
+	AttributeDescription	*a_new_desc;
+	int				i, count;
+
+	a_new = e->e_attrs;
+
+	while ( a_new != NULL ) {
+		a_new_desc = a_new->a_desc;
+		mod = (Modifications *) malloc( sizeof( Modifications ));
+		
+		mod->sml_op = LDAP_MOD_REPLACE;
+
+		mod->sml_type = a_new_desc->ad_cname;
+
+		for ( count = 0; a_new->a_vals[count].bv_val; count++ );
+
+		mod->sml_bvalues = (struct berval*) malloc(
+				(count+1) * sizeof( struct berval) );
+
+		/* see slap_mods_check() comments...
+		 * if a_vals == a_nvals, there is no normalizer.
+		 * in this case, mod->sml_nvalues must be left NULL.
+		 */
+		if ( a_new->a_vals != a_new->a_nvals ) {
+			mod->sml_nvalues = (struct berval*) malloc(
+				(count+1) * sizeof( struct berval) );
+		} else {
+			mod->sml_nvalues = NULL;
+		}
+
+		for ( i = 0; i < count; i++ ) {
+			ber_dupbv(mod->sml_bvalues+i, a_new->a_vals+i); 
+			if ( mod->sml_nvalues ) {
+				ber_dupbv( mod->sml_nvalues+i, a_new->a_vals+i ); 
+			} 
+		}
+
+		mod->sml_bvalues[count].bv_val = 0; 
+		mod->sml_bvalues[count].bv_len = 0; 
+
+		if ( mod->sml_nvalues ) {
+			mod->sml_nvalues[count].bv_val = 0; 
+			mod->sml_nvalues[count].bv_len = 0; 
+		}
+
+		mod->sml_desc = a_new_desc;
+		mod->sml_next =NULL;
+		*modtail = mod;
+		modtail = &mod->sml_next;
+		a_new = a_new->a_next; 
+	}
+
+	*mods = modhead;
+
+	return LDAP_SUCCESS;
+}
+
 #ifdef LDAP_SLAPI
 static void initAddPlugin( Operation *op,
 	struct berval *dn, Entry *e, int manageDSAit )