/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
*/
#include "portable.h"
-#include "slapi_common.h"
#include <stdio.h>
#include "ldap_pvt.h"
#include "slap.h"
+
+#ifdef LDAP_SLAPI
#include "slapi.h"
+#endif
int
do_delete(
int rc;
int manageDSAit;
+#ifdef LDAP_SLAPI
Slapi_PBlock *pb = op->o_pb;
+#endif
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ENTRY,
goto cleanup;
}
- /* deref suffix alias if appropriate */
- suffix_alias( be, &ndn );
-
#if defined( LDAP_SLAPI )
- slapi_pblock_set( pb, SLAPI_BACKEND, (void *)be );
- slapi_pblock_set( pb, SLAPI_CONNECTION, (void *)conn );
- slapi_pblock_set( pb, SLAPI_OPERATION, (void *)op );
- slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)dn.bv_val );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(1) );
- slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)op->o_ctrls );
+ slapi_x_backend_set_pb( pb, be );
+ slapi_x_connection_set_pb( pb, conn );
+ slapi_x_operation_set_pb( pb, op );
+ slapi_pblock_set( pb, SLAPI_DELETE_TARGET, (void *)dn.bv_val );
+ slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_DELETE_FN, pb );
- if ( rc != 0 && rc != LDAP_OTHER ) {
+ if ( rc != 0 ) {
/*
- * either there is no preOp (delete) plugins
- * or a plugin failed. Just log it
- *
- * FIXME: is this correct?
+ * A preoperation plugin failure will abort the
+ * entire operation.
*/
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: delete preOps failed\n"));
+ LDAP_LOG( OPERATION, INFO, "do_delete: delete preoperation plugin "
+ "failed\n", 0, 0, 0 );
#else
- Debug (LDAP_DEBUG_TRACE, " delete preOps failed.\n", 0, 0, 0);
+ Debug (LDAP_DEBUG_TRACE, "do_delete: delete preoperation plugin failed.\n",
+ 0, 0, 0);
#endif
+ if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
+ rc = LDAP_OTHER;
+ goto cleanup;
}
#endif /* defined( LDAP_SLAPI ) */
}
#if defined( LDAP_SLAPI )
- rc = doPluginFNs( be, SLAPI_PLUGIN_POST_DELETE_FN, pb );
- if ( rc != 0 && rc != LDAP_OTHER ) {
- /*
- * either there is no postOp (delete) plugins
- * or a plugin failed. Just log it
- *
- * FIXME: is this correct?
- */
+ if ( doPluginFNs( be, SLAPI_PLUGIN_POST_DELETE_FN, pb ) != 0) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: delete postOps failed\n"));
+ LDAP_LOG( OPERATION, INFO, "do_delete: delete postoperation plugins "
+ "failed\n", 0, 0, 0 );
#else
- Debug (LDAP_DEBUG_TRACE, " delete postOps failed.\n", 0, 0, 0);
+ Debug(LDAP_DEBUG_TRACE, "do_delete: delete postoperation plugins "
+ "failed.\n", 0, 0, 0);
#endif
}
#endif /* defined( LDAP_SLAPI ) */