*/
#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_backend_set_pb( pb, be );
- slapi_connection_set_pb( pb, conn );
- slapi_operation_set_pb( pb, op );
+ 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 *)(1) );
+ slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_DELETE_FN, pb );
if ( rc != 0 ) {
0, 0, 0);
#endif
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OTHER;
goto cleanup;
}
#endif /* defined( LDAP_SLAPI ) */