More ldapbis cleanup

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 57733a938ba31f9d0a841681e0231218bb0936f4..e00f6d1a40973eabfcf7d3308999461abd511657 100644 (file)
--- 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,8 +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 );
-               if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user )
-               {
+               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 };
 
@@ -500,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 */
@@ -636,10 +639,16 @@ int slap_add_opattrs(
                if ( oc ) {
                        rc = structural_class( oc->a_vals, &tmp, NULL, text,
                                textbuf, textlen );
-                       if( rc != LDAP_SUCCESS ) return rc;
-
-                       attr_merge_one( op->ora_e, slap_schema.si_ad_structuralObjectClass,
-                               &tmp, NULL );
+                       if( rc == LDAP_SUCCESS ) {
+                               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;
+                       }
                }
        }
 
@@ -733,5 +742,6 @@ int slap_add_opattrs(
                                slap_schema.si_ad_modifyTimestamp, &timestamp, NULL );
                }
        }
+
        return LDAP_SUCCESS;
 }