ITS#4310 seems to affect also back-ldbm

[openldap] / servers / slapd / back-ldbm / add.c

diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index 413d292508e2145487552d3eba4d500217761a01..c44f1eb13df09bbd7d449c844c5ab4b8446dd9f9 100644 (file)
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,6 +25,16 @@
 #include "back-ldbm.h"
 #include "proto-back-ldbm.h"
 
+static int
+ldbm_csn_cb(
+       Operation *op,
+       SlapReply *rs )
+{
+       op->o_callback = op->o_callback->sc_next;
+       slap_graduate_commit_csn( op );
+       return SLAP_CB_CONTINUE;
+}
+
 int
 ldbm_back_add(
     Operation  *op,
@@ -38,13 +48,18 @@ ldbm_back_add(
        AttributeDescription *entry = slap_schema.si_ad_entry;
        char textbuf[SLAP_TEXT_BUFLEN];
        size_t textlen = sizeof textbuf;
-#ifdef LDBM_SUBENTRIES
+       slap_callback cb = { NULL };
        int subentry;
-#endif
 
        Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n",
                op->o_req_dn.bv_val, 0, 0);
        
+       slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
+
+       cb.sc_cleanup = ldbm_csn_cb;
+       cb.sc_next = op->o_callback;
+       op->o_callback = &cb;
+
        rs->sr_err = entry_schema_check( op, op->oq_add.rs_e, NULL,
                get_manageDIT(op), &rs->sr_text, textbuf, textlen );
 
@@ -57,9 +72,7 @@ ldbm_back_add(
        }
        rs->sr_text = NULL;
 
-#ifdef LDBM_SUBENTRIES
        subentry = is_entry_subentry( op->oq_add.rs_e );
-#endif
 
        if ( !access_allowed( op, op->oq_add.rs_e,
                                entry, NULL, ACL_WADD, NULL ) )
@@ -145,7 +158,6 @@ ldbm_back_add(
                        return LDAP_INSUFFICIENT_ACCESS;
                }
 
-#ifdef LDBM_SUBENTRIES
                if ( is_entry_subentry( p )) {
                        Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
                                0, 0, 0 );
@@ -153,7 +165,6 @@ ldbm_back_add(
                        rs->sr_text = "parent is a subentry";
                        goto return_results;
                }
-#endif
 
                if ( is_entry_alias( p ) ) {
                        /* parent is an alias, don't allow add */
@@ -194,12 +205,10 @@ ldbm_back_add(
                        return rs->sr_err;
                }
 
-#ifdef LDBM_SUBENTRIES
                if ( subentry ) {
                        /* FIXME: */
                        /* parent must be an administrative point of the required kind */
                }
-#endif
 
        } else {
                assert( pdn.bv_val == NULL || *pdn.bv_val == '\0' );