X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=36a838b54a25fe36ff9649b8415b2677d01ca14d;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=7bc2f42ed7423da70bd17eb2a79579432d0f053c;hpb=ee7dfb2ab91d06f0dafe8a04910244db1279884a;p=openldap diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 7bc2f42ed7..36a838b54a 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -30,7 +30,6 @@ #include #include -#include "ldap_pvt.h" #include "slap.h" #include "lutil.h" @@ -45,20 +44,8 @@ do_delete( SlapReply *rs ) { struct berval dn = BER_BVNULL; - struct berval pdn = BER_BVNULL; - 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; - int manageDSAit; - -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "do_delete: conn %d\n", op->o_connid, 0, 0 ); -#else + Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 ); -#endif /* * Parse the delete request. It looks like this: @@ -67,70 +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", op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); -#endif send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" ); return SLAPD_DISCONNECT; } if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "do_delete: conn %d get_ctrls failed\n", op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_delete: get_ctrls failed\n", 0, 0, 0 ); -#endif 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 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, - "do_delete: conn %d invalid dn (%s)\n", - op->o_connid, dn.bv_val, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_delete: invalid dn (%s)\n", dn.bv_val, 0, 0 ); -#endif send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" ); goto cleanup; } if( op->o_req_ndn.bv_len == 0 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, - "do_delete: conn %d: Attempt to delete root DSE.\n", - op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_delete: root dse!\n", 0, 0, 0 ); -#endif /* 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, &global_schemandn ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, "do_delete: conn %d: " - "Attempt to delete subschema subentry.\n", op->o_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_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, op->o_req_dn.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 ); /* @@ -172,7 +149,7 @@ do_delete( #define pb op->o_pb if ( pb ) { slapi_int_pblock_set_operation( pb, op ); - slapi_pblock_set( pb, SLAPI_DELETE_TARGET, (void *)dn.bv_val ); + 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, @@ -182,13 +159,8 @@ do_delete( * A preoperation plugin failure will abort the * entire operation. */ -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, "do_delete: " - "delete preoperation plugin failed\n", 0, 0, 0 ); -#else Debug (LDAP_DEBUG_TRACE, "do_delete: " "delete preoperation plugin failed.\n", 0, 0, 0); -#endif if ( ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 ) || rs->sr_err == LDAP_SUCCESS ) @@ -213,11 +185,16 @@ do_delete( if ( !SLAP_SHADOW(op->o_bd) || repl_user ) #endif { - slap_callback cb = { NULL, slap_replog_cb, NULL, NULL }; + 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 = { 0 , NULL }; - char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ]; + struct berval csn = BER_BVNULL; + char csnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 ); } @@ -295,22 +272,12 @@ do_delete( if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_DELETE_FN, pb ) < 0) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, - "do_delete: delete postoperation plugins failed\n", - 0, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "do_delete: delete postoperation plugins failed\n", 0, 0, 0 ); -#endif } #endif /* defined( LDAP_SLAPI ) */ -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 ); +cleanup:; return rs->sr_err; }