X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=e00f6d1a40973eabfcf7d3308999461abd511657;hb=dbaf7c5c2503b2770c9075e30a9a63b6ff577d6f;hp=bca76664dd02e2a836a512da7eefd895bf5242b7;hpb=fe3b6d00714d551a4c781ee24627e2586d06459f;p=openldap

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index bca76664dd..e00f6d1a40 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -69,7 +69,7 @@ do_add( Operation *op, SlapReply *rs )
 		return SLAPD_DISCONNECT;
 	}
 
-	op->ora_e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	op->ora_e = entry_alloc();
 
 	rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
 		op->o_tmpmemctx );
@@ -180,6 +180,13 @@ do_add( Operation *op, SlapReply *rs )
 
 	op->o_bd = frontendDB;
 	rc = frontendDB->be_add( op, rs );
+
+#ifdef LDAP_X_TXN
+	if ( rc == LDAP_X_TXN_SPECIFY_OKAY ) {
+		/* skip cleanup */
+		return rc;
+	} else
+#endif
 	if ( rc == 0 ) {
 		if ( op->ora_e != NULL && op->o_private != NULL ) {
 			BackendDB	*bd = op->o_bd;
@@ -281,10 +288,7 @@ fe_op_add( Operation *op, SlapReply *rs )
 	if ( op->o_bd->be_add ) {
 		/* do the update here */
 		int repl_user = be_isupdate( op );
-#ifndef SLAPD_MULTIMASTER
-		if ( !SLAP_SHADOW(op->o_bd) || repl_user )
-#endif /* ! SLAPD_MULTIMASTER */
-		{
+		if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user ) {
 			int		update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn );
 			slap_callback	cb = { NULL, slap_replog_cb, NULL, NULL };
 
@@ -325,15 +329,11 @@ fe_op_add( Operation *op, SlapReply *rs )
 					send_ldap_result( op, rs );
 					goto done;
 				}
-			}
 
-#ifdef SLAPD_MULTIMASTER
-			if ( !repl_user )
-#endif /* SLAPD_MULTIMASTER */
-			{
 				cb.sc_next = op->o_callback;
 				op->o_callback = &cb;
 			}
+
 			rc = op->o_bd->be_add( op, rs );
 			if ( rc == LDAP_SUCCESS ) {
 				/* NOTE: be_entry_release_w() is
@@ -343,7 +343,6 @@ fe_op_add( Operation *op, SlapReply *rs )
 				op->o_private = op->o_bd;
 			}
 
-#ifndef SLAPD_MULTIMASTER
 		} else {
 			BerVarray defref = NULL;
 
@@ -366,7 +365,6 @@ fe_op_add( Operation *op, SlapReply *rs )
 					LDAP_UNWILLING_TO_PERFORM,
 					"shadow context; no update referral" );
 			}
-#endif /* SLAPD_MULTIMASTER */
 		}
 	} else {
 		Debug( LDAP_DEBUG_ARGS, "do_add: no backend support\n", 0, 0, 0 );
@@ -508,10 +506,7 @@ slap_mods2entry(
 			}
 		}
 
-		attr = ch_calloc( 1, sizeof(Attribute) );
-
-		/* move ad to attr structure */
-		attr->a_desc = mods->sml_desc;
+		attr = attr_alloc( mods->sml_desc );
 
 		/* move values to attr structure */
 		/*	should check for duplicates */
@@ -644,18 +639,24 @@ int slap_add_opattrs(
 		if ( oc ) {
 			rc = structural_class( oc->a_vals, &tmp, NULL, text,
 				textbuf, textlen );
-			if( rc != LDAP_SUCCESS ) return rc;
+			if( rc == LDAP_SUCCESS ) {
+				attr_merge_one( op->ora_e,
+					slap_schema.si_ad_structuralObjectClass,
+					&tmp, NULL );
 
-			attr_merge_one( op->ora_e, slap_schema.si_ad_structuralObjectClass,
-				&tmp, NULL );
+			} else if ( !SLAP_NO_SCHEMA_CHECK( op->o_bd ) &&
+				!get_no_schema_check( op ) )
+			{
+				return rc;
+			}
 		}
 	}
 
 	if ( SLAP_LASTMOD( op->o_bd ) ) {
 		char *ptr;
-		timestamp.bv_val = timebuf;
 		int gotcsn = 0;
 
+		timestamp.bv_val = timebuf;
 		a = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_entryCSN );
 		if ( a ) {
 			gotcsn = 1;
@@ -741,5 +742,6 @@ int slap_add_opattrs(
 				slap_schema.si_ad_modifyTimestamp, &timestamp, NULL );
 		}
 	}
+
 	return LDAP_SUCCESS;
 }