ACIs almost entirely factored out of slapd

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 40a87c07f3bd67e051c54c9d1c1290d30e036849..51bb8d7902d706a95343559cad1285413d9c143e 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -34,10 +34,6 @@
 
 #include "lutil.h"
 
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-#endif
-
 int
 do_delete(
     Operation  *op,
@@ -156,33 +152,6 @@ fe_op_delete( Operation *op, SlapReply *rs )
                goto cleanup;
        }
 
-#if defined( LDAP_SLAPI )
-#define pb op->o_pb
-       if ( pb ) {
-               slapi_int_pblock_set_operation( pb, op );
-               slapi_pblock_set( pb, SLAPI_DELETE_TARGET, (void *)op->o_req_dn.bv_val );
-               slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
-
-               rs->sr_err = slapi_int_call_plugins( op->o_bd,
-                       SLAPI_PLUGIN_PRE_DELETE_FN, pb );
-               if ( rs->sr_err < 0 ) {
-                       /*
-                        * A preoperation plugin failure will abort the
-                        * entire operation.
-                        */
-                       Debug (LDAP_DEBUG_TRACE, "do_delete: "
-                               "delete preoperation plugin failed.\n", 0, 0, 0);
-                       if ( ( slapi_pblock_get( pb, SLAPI_RESULT_CODE,
-                               (void *)&rs->sr_err ) != 0 ) ||
-                               rs->sr_err == LDAP_SUCCESS )
-                       {
-                               rs->sr_err = LDAP_OTHER;
-                       }
-                       goto cleanup;
-               }
-       }
-#endif /* defined( LDAP_SLAPI ) */
-
        /*
         * do the delete if 1 && (2 || 3)
         * 1) there is a delete function implemented in this backend;
@@ -235,7 +204,7 @@ fe_op_delete( Operation *op, SlapReply *rs )
                        {
                                op->o_delete_glue_parent = 0;
                                if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) {
-                                       slap_callback cb = { NULL };
+                                       slap_callback cb = { NULL, NULL, NULL, NULL };
                                        cb.sc_response = slap_null_cb;
                                        dnParent( &op->o_req_ndn, &pdn );
                                        op->o_req_dn = pdn;
@@ -281,16 +250,6 @@ fe_op_delete( Operation *op, SlapReply *rs )
                        "operation not supported within namingContext" );
        }
 
-#if defined( LDAP_SLAPI )
-       if ( pb != NULL && slapi_int_call_plugins( op->o_bd,
-               SLAPI_PLUGIN_POST_DELETE_FN, pb ) < 0)
-       {
-               Debug(LDAP_DEBUG_TRACE,
-                       "do_delete: delete postoperation plugins failed\n",
-                       0, 0, 0 );
-       }
-#endif /* defined( LDAP_SLAPI ) */
-
 cleanup:;
        return rs->sr_err;
 }