X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=36a838b54a25fe36ff9649b8415b2677d01ca14d;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=5584e61a5e80a7fd5e752251680215e5ba20ec15;hpb=e9a74cffbad6cd33a6e8ad1ec3919e96a9b52415;p=openldap
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 5584e61a5e..36a838b54a 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -1,10 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -16,39 +24,28 @@
*/
#include "portable.h"
-#include "slapi_common.h"
#include
#include
#include
-#include "ldap_pvt.h"
#include "slap.h"
-#include "slapi.h"
+
+#include "lutil.h"
+
+#ifdef LDAP_SLAPI
+#include "slapi/slapi.h"
+#endif
int
do_delete(
- Connection *conn,
- Operation *op
-)
+ Operation *op,
+ SlapReply *rs )
{
- struct berval dn = { 0, NULL };
- struct berval pdn = { 0, NULL };
- struct berval ndn = { 0, NULL };
- const char *text;
- Backend *be;
- int rc;
- int manageDSAit;
-
- Slapi_PBlock *pb = op->o_pb;
-
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ENTRY,
- "do_delete: conn %d\n", conn->c_connid, 0, 0 );
-#else
+ struct berval dn = BER_BVNULL;
+
Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 );
-#endif
/*
* Parse the delete request. It looks like this:
@@ -57,71 +54,60 @@ do_delete(
*/
if ( ber_scanf( op->o_ber, "m", &dn ) == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_delete: conn: %d ber_scanf failed\n", conn->c_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
-#endif
- send_ldap_disconnect( conn, op,
- LDAP_PROTOCOL_ERROR, "decoding error" );
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
return SLAPD_DISCONNECT;
}
- if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_delete: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 );
-#else
+ if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "do_delete: get_ctrls failed\n", 0, 0, 0 );
-#endif
goto cleanup;
}
- rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
- if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_delete: conn %d invalid dn (%s)\n",
- conn->c_connid, dn.bv_val, 0 );
-#else
+ rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
+ op->o_tmpmemctx );
+ if( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"do_delete: invalid dn (%s)\n", dn.bv_val, 0, 0 );
-#endif
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid DN", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
goto cleanup;
}
- if( ndn.bv_len == 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_delete: conn %d: Attempt to delete root DSE.\n",
- conn->c_connid, 0, 0 );
-#else
+ if( op->o_req_ndn.bv_len == 0 ) {
Debug( LDAP_DEBUG_ANY, "do_delete: root dse!\n", 0, 0, 0 );
-#endif
/* protocolError would likely be a more appropriate error */
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "cannot delete the root DSE", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "cannot delete the root DSE" );
goto cleanup;
- } else if ( bvmatch( &ndn, &global_schemandn ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO, "do_delete: conn %d: "
- "Attempt to delete subschema subentry.\n", conn->c_connid, 0, 0 );
-#else
+ } else if ( bvmatch( &op->o_req_ndn, &frontendDB->be_schemandn ) ) {
Debug( LDAP_DEBUG_ANY, "do_delete: subschema subentry!\n", 0, 0, 0 );
-#endif
/* protocolError would likely be a more appropriate error */
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "cannot delete the root DSE", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "cannot delete the root DSE" );
goto cleanup;
}
- Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu DEL dn=\"%s\"\n",
- op->o_connid, op->o_opid, pdn.bv_val, 0, 0 );
+ Statslog( LDAP_DEBUG_STATS, "%s DEL dn=\"%s\"\n",
+ op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
+
+ op->o_bd = frontendDB;
+ rs->sr_err = frontendDB->be_delete( op, rs );
+cleanup:;
+ slap_graduate_commit_csn( op );
+
+ op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+ op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+ return rs->sr_err;
+}
+
+int
+fe_op_delete( Operation *op, SlapReply *rs )
+{
+ struct berval pdn = BER_BVNULL;
+ int manageDSAit;
+
manageDSAit = get_manageDSAit( op );
/*
@@ -129,57 +115,60 @@ do_delete(
* appropriate one, or send a referral to our "referral server"
* if we don't hold it.
*/
- if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
- BerVarray ref = referral_rewrite( default_referral,
- NULL, &pdn, LDAP_SCOPE_DEFAULT );
+ op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 );
+ if ( op->o_bd == NULL ) {
+ rs->sr_ref = referral_rewrite( default_referral,
+ NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
- send_ldap_result( conn, op, rc = LDAP_REFERRAL,
- NULL, NULL, ref ? ref : default_referral, NULL );
+ if (!rs->sr_ref) rs->sr_ref = default_referral;
+ if ( rs->sr_ref != NULL ) {
+ rs->sr_err = LDAP_REFERRAL;
- ber_bvarray_free( ref );
+ send_ldap_result( op, rs );
+
+ if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
+ } else {
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "no global superior knowledge" );
+ }
goto cleanup;
}
/* check restrictions */
- rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
- if( rc != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, rc,
- NULL, text, NULL, NULL );
+ if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
goto cleanup;
}
/* check for referrals */
- rc = backend_check_referrals( be, conn, op, &pdn, &ndn );
- if ( rc != LDAP_SUCCESS ) {
+ if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
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 );
-
- rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_DELETE_FN, pb );
- if ( rc != 0 && rc != LDAP_OTHER ) {
- /*
- * either there is no preOp (delete) plugins
- * or a plugin failed. Just log it
- *
- * FIXME: is this correct?
- */
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO, "do_delete: delete preOps "
- "failed\n", 0, 0, 0 );
-#else
- Debug (LDAP_DEBUG_TRACE, "do_delete: delete preOps failed.\n",
- 0, 0, 0);
-#endif
+#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 ) */
@@ -189,61 +178,106 @@ do_delete(
* 2) this backend is master for what it holds;
* 3) it's a replica and the dn supplied is the update_ndn.
*/
- if ( be->be_delete ) {
+ if ( op->o_bd->be_delete ) {
/* do the update here */
- int repl_user = be_isupdate( be, &op->o_ndn );
+ int repl_user = be_isupdate( op );
#ifndef SLAPD_MULTIMASTER
- if ( !be->be_update_ndn.bv_len || repl_user )
+ if ( !SLAP_SHADOW(op->o_bd) || repl_user )
#endif
{
- if ( (*be->be_delete)( be, conn, op, &pdn, &ndn ) == 0 ) {
+ struct berval org_req_dn = BER_BVNULL;
+ struct berval org_req_ndn = BER_BVNULL;
+ struct berval org_dn = BER_BVNULL;
+ struct berval org_ndn = BER_BVNULL;
+ int org_managedsait;
+ slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
+
+ if ( !repl_user ) {
+ struct berval csn = BER_BVNULL;
+ char csnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
+ slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 );
+ }
+
#ifdef SLAPD_MULTIMASTER
- if ( !be->be_update_ndn.bv_len || !repl_user )
+ if ( !op->o_bd->be_update_ndn.bv_len || !repl_user )
#endif
- {
- replog( be, op, &pdn, &ndn, NULL );
+ {
+ cb.sc_next = op->o_callback;
+ op->o_callback = &cb;
+ }
+
+ op->o_bd->be_delete( op, rs );
+
+ org_req_dn = op->o_req_dn;
+ org_req_ndn = op->o_req_ndn;
+ org_dn = op->o_dn;
+ org_ndn = op->o_ndn;
+ org_managedsait = get_manageDSAit( op );
+ op->o_dn = op->o_bd->be_rootdn;
+ op->o_ndn = op->o_bd->be_rootndn;
+ op->o_managedsait = 1;
+
+ while ( rs->sr_err == LDAP_SUCCESS &&
+ op->o_delete_glue_parent )
+ {
+ op->o_delete_glue_parent = 0;
+ if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) {
+ slap_callback cb = { NULL };
+ cb.sc_response = slap_null_cb;
+ dnParent( &op->o_req_ndn, &pdn );
+ op->o_req_dn = pdn;
+ op->o_req_ndn = pdn;
+ op->o_callback = &cb;
+ op->o_bd->be_delete( op, rs );
+ } else {
+ break;
}
}
+
+ op->o_managedsait = org_managedsait;
+ op->o_dn = org_dn;
+ op->o_ndn = org_ndn;
+ op->o_req_dn = org_req_dn;
+ op->o_req_ndn = org_req_ndn;
+ op->o_delete_glue_parent = 0;
+
#ifndef SLAPD_MULTIMASTER
} else {
- BerVarray defref = be->be_update_refs
- ? be->be_update_refs : default_referral;
- BerVarray ref = referral_rewrite( default_referral,
- NULL, &pdn, LDAP_SCOPE_DEFAULT );
+ BerVarray defref = op->o_bd->be_update_refs
+ ? op->o_bd->be_update_refs : default_referral;
+
+ if ( defref != NULL ) {
+ rs->sr_ref = referral_rewrite( defref,
+ NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
+ if (!rs->sr_ref) rs->sr_ref = defref;
+ rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
- send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
- ref ? ref : defref, NULL );
+ if (rs->sr_ref != defref) ber_bvarray_free( rs->sr_ref );
- ber_bvarray_free( ref );
+ } else {
+ send_ldap_error( op, rs,
+ LDAP_UNWILLING_TO_PERFORM,
+ "shadow context; no update referral" );
+ }
#endif
}
} else {
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "operation not supported within namingContext", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "operation not supported within namingContext" );
}
#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?
- */
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO, "do_delete: delete postOps "
- "failed\n", 0, 0, 0 );
-#else
- Debug(LDAP_DEBUG_TRACE, "do_delete: delete postOps "
- "failed.\n", 0, 0, 0);
-#endif
+ 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:
- free( pdn.bv_val );
- free( ndn.bv_val );
- return rc;
+cleanup:;
+ return rs->sr_err;
}