X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=362f1b915a3fe5f1dd343a15dbed6f07675c452a;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=77b2f4098a1e76f37cdb4af0c7110a0126c8795b;hpb=d5edb4bff62150cf35e8b9c59798017ff58febc0;p=openldap diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 77b2f4098a..362f1b915a 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -31,19 +31,20 @@ do_delete( Operation *op ) { - char *dn, *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", NULL, NULL ); - return LDAP_SASL_BIND_IN_PROGRESS; - } +#endif /* * Parse the delete request. It looks like this: @@ -51,60 +52,109 @@ 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 )); +#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; } - ndn = ch_strdup( dn ); + if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) { +#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; + } - if( dn_normalize( ndn ) == NULL ) { - Debug( LDAP_DEBUG_ANY, "do_delete: invalid dn (%s)\n", dn, 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( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 ); + 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 + } Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n", - op->o_connid, op->o_opid, dn, 0, 0 ); + op->o_connid, op->o_opid, pdn.bv_val, 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 ) { + 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, default_referral, NULL ); + NULL, NULL, ref ? ref : default_referral, NULL ); + + bvarray_free( ref ); goto cleanup; } - /* make sure this backend recongizes critical controls */ - rc = backend_check_controls( be, conn, op ) ; - + /* check restrictions */ + rc = backend_check_restrictions( be, conn, op, NULL, &text ) ; if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, - NULL, NULL, NULL, NULL ); + NULL, text, NULL, NULL ); + goto cleanup; } - if ( global_readonly || be->be_readonly ) { - Debug( LDAP_DEBUG_ANY, "do_delete: database is read-only\n", - 0, 0, 0 ); - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, - NULL, "database is read-only", NULL, NULL ); - rc = LDAP_UNWILLING_TO_PERFORM; + /* check for referrals */ + rc = backend_check_referrals( be, conn, op, &pdn, &ndn ); + if ( rc != LDAP_SUCCESS ) { goto cleanup; } /* deref suffix alias if appropriate */ - ndn = suffix_alias( be, ndn ); + suffix_alias( be, &ndn ); /* * do the delete if 1 && (2 || 3) @@ -114,33 +164,40 @@ do_delete( */ if ( be->be_delete ) { /* do the update here */ + int repl_user = be_isupdate( be, &op->o_ndn ); #ifndef SLAPD_MULTIMASTER - if ( be->be_update_ndn == NULL || - strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) + if ( !be->be_update_ndn.bv_len || repl_user ) #endif { - if ( (*be->be_delete)( be, conn, op, dn, ndn ) == 0 ) { + if ( (*be->be_delete)( be, conn, op, &pdn, &ndn ) == 0 ) { #ifdef SLAPD_MULTIMASTER - if (be->be_update_ndn == NULL || - strcmp( be->be_update_ndn, op->o_ndn )) + if ( !be->be_update_ndn.bv_len || !repl_user ) #endif { - replog( be, op, dn, NULL ); + replog( be, op, &pdn, &ndn, NULL ); } } #ifndef SLAPD_MULTIMASTER } else { + 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, - be->be_update_refs ? be->be_update_refs : default_referral, NULL ); + ref ? ref : defref, NULL ); + + bvarray_free( ref ); #endif } } else { send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "Function not implemented", NULL, NULL ); + NULL, "operation not supported within namingContext", NULL, NULL ); } + cleanup: - free( ndn ); - free( dn ); + free( pdn.bv_val ); + free( ndn.bv_val ); return rc; }