X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=daade821c01217927de76e0857b3846d150fa7e7;hb=426ca14a868b6edb638b48e14593542a365fcc4b;hp=27a68d529d97fd50c25c166942f190d19a30b6b1;hpb=d71888c0aa2d1da152227947127201c797e30b3a;p=openldap diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 27a68d529d..daade821c0 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -25,21 +25,26 @@ #include "ldap_pvt.h" #include "slap.h" +#ifdef LDAP_SLAPI +#include "slapi.h" +#endif + int do_delete( - Connection *conn, - Operation *op + Operation *op, + SlapReply *rs ) { - char *dn, *ndn = NULL; - const char *text; - Backend *be; - int rc; + struct berval dn = { 0, NULL }; int manageDSAit; +#ifdef LDAP_SLAPI + Slapi_PBlock *pb = op->o_pb; +#endif + #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "do_delete: conn %d\n", conn->c_connid )); + 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 @@ -50,72 +55,69 @@ do_delete( * DelRequest := DistinguishedName */ - if ( ber_scanf( op->o_ber, "a", &dn ) == LBER_ERROR ) { + if ( ber_scanf( op->o_ber, "m", &dn ) == LBER_ERROR ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "do_delete: conn: %d ber_scanf failed\n", conn->c_connid )); + 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_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 ) { + if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "oepration", LDAP_LEVEL_ERR, - "do_delete: conn %d get_ctrls failed\n", conn->c_connid )); + 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; } - ndn = ch_strdup( dn ); - - if( dn_normalize( ndn ) == NULL ) { + rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn ); + if( rs->sr_err != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "do_delete: conn %d invalid dn (%s).\n", conn->c_connid, dn )); + 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, 0, 0 ); + 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 == '\0' ) { + if( op->o_req_ndn.bv_len == 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: conn %d: " - "Attempt to delete root DSE.\n", conn->c_connid )); + 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_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; -#ifdef SLAPD_SCHEMA_DN - } else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) { + } else if ( bvmatch( &op->o_req_ndn, &global_schemandn ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: conn %d: " - "Attempt to delete subschema subentry.\n", conn->c_connid )); + LDAP_LOG( OPERATION, INFO, "do_delete: conn %d: " + "Attempt to delete subschema subentry.\n", op->o_connid, 0, 0 ); #else 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; - -#endif } - Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n", - op->o_connid, op->o_opid, dn, 0, 0 ); + 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 ); manageDSAit = get_manageDSAit( op ); @@ -124,33 +126,53 @@ 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 ) { - struct berval **ref = referral_rewrite( default_referral, - NULL, dn, LDAP_SCOPE_DEFAULT ); + if ( (op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 )) == NULL ) { + rs->sr_ref = referral_rewrite( default_referral, + NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); + + if (!rs->sr_ref) rs->sr_ref = default_referral; + rs->sr_err = LDAP_REFERRAL; - send_ldap_result( conn, op, rc = LDAP_REFERRAL, - NULL, NULL, ref ? ref : default_referral, NULL ); + send_ldap_result( op, rs ); - ber_bvecfree( ref ); + if (rs->sr_ref!= default_referral) ber_bvarray_free( rs->sr_ref ); 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, dn, ndn ); - if ( rc != LDAP_SUCCESS ) { + if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) { goto cleanup; } - /* deref suffix alias if appropriate */ - ndn = suffix_alias( be, ndn ); +#if defined( LDAP_SLAPI ) + slapi_x_pblock_set_operation( pb, op ); + slapi_pblock_set( pb, SLAPI_DELETE_TARGET, (void *)dn.bv_val ); + slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit ); + + rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_DELETE_FN, pb ); + if ( rs->sr_err != 0 ) { + /* + * 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_OTHER; + goto cleanup; + } +#endif /* defined( LDAP_SLAPI ) */ /* * do the delete if 1 && (2 || 3) @@ -158,41 +180,55 @@ 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->o_bd, &op->o_ndn ); #ifndef SLAPD_MULTIMASTER - if ( be->be_update_ndn == NULL || repl_user ) + if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) #endif { - if ( (*be->be_delete)( be, conn, op, dn, ndn ) == 0 ) { + if ( (op->o_bd->be_delete)( op, rs ) == 0 ) { #ifdef SLAPD_MULTIMASTER - if (be->be_update_ndn == NULL || !repl_user ) + if ( !op->o_bd->be_update_ndn.bv_len || !repl_user ) #endif { - replog( be, op, dn, ndn, NULL ); + replog( op ); } } #ifndef SLAPD_MULTIMASTER } else { - struct berval **defref = be->be_update_refs - ? be->be_update_refs : default_referral; - struct berval **ref = referral_rewrite( default_referral, - NULL, dn, LDAP_SCOPE_DEFAULT ); + BerVarray defref = op->o_bd->be_update_refs + ? op->o_bd->be_update_refs : default_referral; + 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 : defref, NULL ); + if (!rs->sr_ref) rs->sr_ref = defref; + rs->sr_err = LDAP_REFERRAL; + send_ldap_result( op, rs ); - ber_bvecfree( ref ); + if (rs->sr_ref != defref) ber_bvarray_free( rs->sr_ref ); #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 ) + if ( doPluginFNs( 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: - if( ndn != NULL ) free( ndn ); - free( dn ); - return rc; + free( op->o_req_dn.bv_val ); + free( op->o_req_ndn.bv_val ); + return rs->sr_err; }