X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=7824ca212b01649a61b7fbcb2cba2fad39e29a1c;hb=0a5f1e8516d386784ed7f605e5d03c7ee6d7cedd;hp=c1557adf8e37d99aaa8a402371074722048c0b6d;hpb=bdb3adca391c604edfdeb86930e2347310ec372b;p=openldap

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index c1557adf8e..7824ca212b 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
@@ -133,7 +141,8 @@ do_add( Operation *op, SlapReply *rs )
 			Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
 				tmp.sml_type.bv_val, 0, 0 );
 #endif
-			send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, "no values for attribute type" );
+			send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+				"no values for attribute type" );
 			goto done;
 		}
 
@@ -172,7 +181,8 @@ do_add( Operation *op, SlapReply *rs )
 	} 
 
 	if ( modlist == NULL ) {
-		send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, "no attributes provided" );
+		send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+			"no attributes provided" );
 		goto done;
 	}
 
@@ -181,11 +191,13 @@ do_add( Operation *op, SlapReply *rs )
 
 	if( e->e_nname.bv_len == 0 ) {
 		/* protocolError may be a more appropriate error */
-		send_ldap_error( op, rs, LDAP_ALREADY_EXISTS, "root DSE already exists" );
+		send_ldap_error( op, rs, LDAP_ALREADY_EXISTS,
+			"root DSE already exists" );
 		goto done;
 
 	} else if ( bvmatch( &e->e_nname, &global_schemandn ) ) {
-		send_ldap_error( op, rs, LDAP_ALREADY_EXISTS, "subschema subentry already exists" );
+		send_ldap_error( op, rs, LDAP_ALREADY_EXISTS,
+			"subschema subentry already exists" );
 		goto done;
 	}
 
@@ -205,7 +217,9 @@ do_add( Operation *op, SlapReply *rs )
 			rs->sr_err = LDAP_REFERRAL;
 			send_ldap_result( op, rs );
 
-			if ( rs->sr_ref != default_referral ) ber_bvarray_free( rs->sr_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" );
@@ -225,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 */
 
 	/*
@@ -238,7 +252,10 @@ do_add( Operation *op, SlapReply *rs )
 		/* do the update here */
 		int repl_user = be_isupdate(op->o_bd, &op->o_ndn );
 #ifndef SLAPD_MULTIMASTER
-		if ( !op->o_bd->be_update_ndn.bv_len || repl_user )
+		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;
@@ -246,7 +263,7 @@ do_add( Operation *op, SlapReply *rs )
 			size_t textlen = sizeof textbuf;
 
 			rs->sr_err = slap_mods_check( modlist, update, &rs->sr_text,
-				textbuf, textlen, NULL );
+										  textbuf, textlen, NULL );
 
 			if( rs->sr_err != LDAP_SUCCESS ) {
 				send_ldap_result( op, rs );
@@ -269,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;
@@ -281,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 */
 
@@ -302,21 +321,33 @@ do_add( Operation *op, SlapReply *rs )
 
 #ifndef SLAPD_MULTIMASTER
 		} else {
-			BerVarray defref;
+			BerVarray defref = NULL;
 #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;
+			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 */
 
-			defref = op->o_bd->be_update_refs
-				? op->o_bd->be_update_refs : default_referral;
+			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, &e->e_name, LDAP_SCOPE_DEFAULT );
@@ -335,11 +366,13 @@ 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
 	    LDAP_LOG( OPERATION, INFO, 
@@ -348,14 +381,17 @@ do_add( Operation *op, SlapReply *rs )
 	    Debug( LDAP_DEBUG_ARGS, "	 do_add: no backend support\n", 0, 0, 0 );
 #endif
 	    send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
-			      "operation not supported within namingContext" );
+			"operation not supported within namingContext" );
 	}
 
 #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 );
 	}
@@ -373,6 +409,7 @@ slap_mods2entry(
 	Modifications *mods,
 	Entry **e,
 	int repl_user,
+	int dup,
 	const char **text,
 	char *textbuf, size_t textlen )
 {
@@ -384,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 );
@@ -431,6 +470,7 @@ slap_mods2entry(
 				/* trim the mods array */
 				ch_free( mods->sml_nvalues );
 				mods->sml_nvalues = NULL;
+
 			} else {
 				attr->a_nvals = attr->a_vals;
 			}
@@ -469,14 +509,20 @@ slap_mods2entry(
 				int		rc = LDAP_SUCCESS;
 				int match;
 
-				for ( i = 0; mods->sml_nvalues[i].bv_val != NULL; i++ ) {
+				for ( i = 0; mods->sml_values[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 );
+							mods->sml_nvalues
+								? &mods->sml_nvalues[i]
+								: &mods->sml_values[i],
+							mods->sml_nvalues
+								? &mods->sml_nvalues[j]
+								: &mods->sml_values[j],
+							text );
 						if ( rc == LDAP_SUCCESS && match == 0 ) {
 							/* value exists already */
 							snprintf( textbuf, textlen,
@@ -496,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;
 		}
@@ -517,6 +584,76 @@ slap_mods2entry(
 	return LDAP_SUCCESS;
 }
 
+int
+slap_entry2mods(
+	Entry *e,
+	Modifications **mods,
+	const char **text
+)
+{
+	Modifications	*modhead = NULL;
+	Modifications	*mod;
+	Modifications	**modtail = &modhead;
+	Attribute		*a_new;
+	AttributeDescription	*a_new_desc;
+	int				i, count, rc;
+
+	a_new = e->e_attrs;
+
+	while ( a_new != NULL ) {
+		a_new_desc = a_new->a_desc;
+		mod = (Modifications *) malloc( sizeof( Modifications ));
+		
+		if ( a_new_desc != slap_schema.si_ad_queryid )
+			mod->sml_op = LDAP_MOD_REPLACE;
+		else
+			mod->sml_op = LDAP_MOD_ADD;
+
+		ber_dupbv( &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 )
@@ -543,8 +680,10 @@ static int doPreAddPluginFNs( Operation *op )
 #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 )
+		if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 ) ||
+		     rc == LDAP_SUCCESS ) {
 			rc = LDAP_OTHER;
+		}
 #endif
 	} else {
 		rc = LDAP_SUCCESS;