X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=2fe382653d21b606301932bf8f47e21261718680;hb=7d13ef7e42f1514dd99878835a13a700da4f4b69;hp=722359ae06e9b99979f80249c9ce8475ef45047e;hpb=ffe20229dc2a3c0b69c327d49dbbea172d213e4c;p=openldap diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 722359ae06..2fe382653d 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2005 The OpenLDAP Foundation. + * Copyright 1998-2012 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,8 +41,8 @@ do_delete( { struct berval dn = BER_BVNULL; - Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 ); - + Debug( LDAP_DEBUG_TRACE, "%s do_delete\n", + op->o_log_prefix, 0, 0 ); /* * Parse the delete request. It looks like this: * @@ -50,49 +50,58 @@ do_delete( */ if ( ber_scanf( op->o_ber, "m", &dn ) == LBER_ERROR ) { - Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "%s do_delete: ber_scanf failed\n", + op->o_log_prefix, 0, 0 ); send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" ); return SLAPD_DISCONNECT; } if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, "do_delete: get_ctrls failed\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "%s do_delete: get_ctrls failed\n", + op->o_log_prefix, 0, 0 ); goto cleanup; } 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 ); + Debug( LDAP_DEBUG_ANY, "%s do_delete: invalid dn (%s)\n", + op->o_log_prefix, dn.bv_val, 0 ); send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" ); goto cleanup; } + Statslog( LDAP_DEBUG_STATS, "%s DEL dn=\"%s\"\n", + op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 ); + if( op->o_req_ndn.bv_len == 0 ) { - Debug( LDAP_DEBUG_ANY, "do_delete: root dse!\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "%s do_delete: root dse!\n", + op->o_log_prefix, 0, 0 ); /* protocolError would likely be a more appropriate error */ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, "cannot delete the root DSE" ); goto cleanup; } else if ( bvmatch( &op->o_req_ndn, &frontendDB->be_schemandn ) ) { - Debug( LDAP_DEBUG_ANY, "do_delete: subschema subentry!\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "%s do_delete: subschema subentry!\n", + op->o_log_prefix, 0, 0 ); /* protocolError would likely be a more appropriate error */ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, "cannot delete the root DSE" ); goto cleanup; } - 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 ); +#ifdef LDAP_X_TXN + if( rs->sr_err == LDAP_X_TXN_SPECIFY_OKAY ) { + /* skip cleanup */ + return rs->sr_err; + } +#endif +cleanup:; 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; @@ -102,35 +111,28 @@ int fe_op_delete( Operation *op, SlapReply *rs ) { struct berval pdn = BER_BVNULL; - int manageDSAit; - BackendDB *op_be; + BackendDB *op_be, *bd = op->o_bd; - manageDSAit = get_manageDSAit( op ); - /* * We could be serving multiple database backends. Select the * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ - op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 1 ); + op->o_bd = select_backend( &op->o_req_ndn, 1 ); if ( op->o_bd == NULL ) { + op->o_bd = bd; rs->sr_ref = referral_rewrite( default_referral, NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); if (!rs->sr_ref) rs->sr_ref = default_referral; if ( rs->sr_ref != NULL ) { rs->sr_err = LDAP_REFERRAL; - - op->o_bd = frontendDB; send_ldap_result( op, rs ); - op->o_bd = NULL; if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref ); } else { - op->o_bd = frontendDB; send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, "no global superior knowledge" ); - op->o_bd = NULL; } goto cleanup; } @@ -138,7 +140,7 @@ fe_op_delete( Operation *op, SlapReply *rs ) /* If we've got a glued backend, check the real backend */ op_be = op->o_bd; if ( SLAP_GLUE_INSTANCE( op->o_bd )) { - op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 ); + op->o_bd = select_backend( &op->o_req_ndn, 0 ); } /* check restrictions */ @@ -161,33 +163,14 @@ fe_op_delete( Operation *op, SlapReply *rs ) if ( op->o_bd->be_delete ) { /* do the update here */ int repl_user = be_isupdate( op ); -#ifndef SLAPD_MULTIMASTER - if ( !SLAP_SHADOW(op->o_bd) || repl_user ) -#endif - { + if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user ) { 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 }; op->o_bd = op_be; - - 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 ( !op->o_bd->be_update_ndn.bv_len || !repl_user ) -#endif - { - cb.sc_next = op->o_callback; - op->o_callback = &cb; - } - op->o_bd->be_delete( op, rs ); org_req_dn = op->o_req_dn; @@ -204,7 +187,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; @@ -223,7 +206,6 @@ fe_op_delete( Operation *op, SlapReply *rs ) op->o_req_ndn = org_req_ndn; op->o_delete_glue_parent = 0; -#ifndef SLAPD_MULTIMASTER } else { BerVarray defref = op->o_bd->be_update_refs ? op->o_bd->be_update_refs : default_referral; @@ -242,7 +224,6 @@ fe_op_delete( Operation *op, SlapReply *rs ) LDAP_UNWILLING_TO_PERFORM, "shadow context; no update referral" ); } -#endif } } else { @@ -251,5 +232,6 @@ fe_op_delete( Operation *op, SlapReply *rs ) } cleanup:; + op->o_bd = bd; return rs->sr_err; }