X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=362f1b915a3fe5f1dd343a15dbed6f07675c452a;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=4d0d7fb0764b8383faf970b722dc6613f8bb7a11;hpb=e9c2895472d41da41fee1ffb049195b190f6adbc;p=openldap diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 4d0d7fb076..362f1b915a 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -1,3 +1,8 @@ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. @@ -17,6 +22,7 @@ #include #include +#include "ldap_pvt.h" #include "slap.h" int @@ -25,19 +31,20 @@ do_delete( Operation *op ) { - char *ndn; + struct berval dn = { 0, NULL }; + struct berval pdn = { 0, NULL }; + struct berval ndn = { 0, NULL }; + const char *text; Backend *be; int rc; + int manageDSAit; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, + "do_delete: conn %d\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 ); - - if( op->o_bind_in_progress ) { - Debug( LDAP_DEBUG_ANY, "do_delete: SASL bind in progress.\n", - 0, 0, 0 ); - send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL, - "SASL bind in progress" ); - return LDAP_SASL_BIND_IN_PROGRESS; - } +#endif /* * Parse the delete request. It looks like this: @@ -45,39 +52,109 @@ do_delete( * DelRequest := DistinguishedName */ - if ( ber_scanf( op->o_ber, "a", &ndn ) == 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 )); +#else Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); +#endif send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); - return -1; + return SLAPD_DISCONNECT; } if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) { - free( ndn ); - Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 ); - return rc; +#ifdef NEW_LOGGING + LDAP_LOG(( "oepration", LDAP_LEVEL_ERR, + "do_delete: conn %d get_ctrls failed\n", conn->c_connid )); +#else + Debug( LDAP_DEBUG_ANY, "do_delete: get_ctrls failed\n", 0, 0, 0 ); +#endif + goto cleanup; } - Debug( LDAP_DEBUG_ARGS, "do_delete: dn (%s)\n", ndn, 0, 0 ); + rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn ); + if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "do_delete: conn %d invalid dn (%s)\n", + conn->c_connid, dn.bv_val )); +#else + 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 ); + goto cleanup; + } + + if( 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 )); +#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 ); + goto cleanup; + +#ifdef SLAPD_SCHEMA_DN + + } else if ( strcasecmp( ndn.bv_val, SLAPD_SCHEMA_DN ) == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: conn %d: " + "Attempt to delete subschema subentry.\n", conn->c_connid )); +#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 ); + goto cleanup; + +#endif + } - dn_normalize_case( ndn ); + Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n", + op->o_connid, op->o_opid, pdn.bv_val, 0, 0 ); - Debug( LDAP_DEBUG_STATS, "DEL dn=\"%s\"\n", ndn, 0, 0 ); + 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. */ - if ( (be = select_backend( ndn )) == NULL ) { - free( ndn ); - send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, NULL, - default_referral ); - return rc; + if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) { + BVarray ref = referral_rewrite( default_referral, + NULL, &pdn, LDAP_SCOPE_DEFAULT ); + + send_ldap_result( conn, op, rc = LDAP_REFERRAL, + NULL, NULL, ref ? ref : default_referral, NULL ); + + bvarray_free( 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 ); + goto cleanup; + } + + /* check for referrals */ + rc = backend_check_referrals( be, conn, op, &pdn, &ndn ); + if ( rc != LDAP_SUCCESS ) { + goto cleanup; } - /* alias suffix if approp */ - ndn = suffixAlias( ndn, op, be ); + /* deref suffix alias if appropriate */ + suffix_alias( be, &ndn ); /* * do the delete if 1 && (2 || 3) @@ -87,21 +164,40 @@ do_delete( */ if ( be->be_delete ) { /* do the update here */ - if ( be->be_update_ndn == NULL || - strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) + int repl_user = be_isupdate( be, &op->o_ndn ); +#ifndef SLAPD_MULTIMASTER + if ( !be->be_update_ndn.bv_len || repl_user ) +#endif { - if ( (*be->be_delete)( be, conn, op, ndn ) == 0 ) { - replog( be, LDAP_REQ_DELETE, ndn, NULL, 0 ); + if ( (*be->be_delete)( be, conn, op, &pdn, &ndn ) == 0 ) { +#ifdef SLAPD_MULTIMASTER + if ( !be->be_update_ndn.bv_len || !repl_user ) +#endif + { + replog( be, op, &pdn, &ndn, NULL ); + } } +#ifndef SLAPD_MULTIMASTER } else { - send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, NULL, - default_referral ); + BVarray defref = be->be_update_refs + ? be->be_update_refs : default_referral; + BVarray ref = referral_rewrite( default_referral, + NULL, &pdn, LDAP_SCOPE_DEFAULT ); + + send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, + ref ? ref : defref, NULL ); + + bvarray_free( ref ); +#endif } + } else { - send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, NULL, - "Function not implemented" ); + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "operation not supported within namingContext", NULL, NULL ); } - free( ndn ); +cleanup: + free( pdn.bv_val ); + free( ndn.bv_val ); return rc; }