X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fdelete.c;h=97f073e1b9c4e0aceec34ba0283252949f192a22;hb=0f17b4f852ce45f517ac86f6866ce39a62476fdb;hp=e102698c67b9d2259ecd82ef48ae06f16d2f92dd;hpb=ffcdc6d11d7e86260be64e47229ca75bc7b7ac20;p=openldap diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index e102698c67..97f073e1b9 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-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -31,15 +31,17 @@ do_delete( Operation *op ) { - char *dn, *ndn = NULL; + 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 )); + LDAP_LOG( OPERATION, ENTRY, + "do_delete: conn %d\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 ); #endif @@ -50,10 +52,10 @@ 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", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); #endif @@ -64,34 +66,48 @@ do_delete( 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 )); + LDAP_LOG( OPERATION, ERR, + "do_delete: conn %d get_ctrls failed\n", conn->c_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 ) { + rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn ); + if( rc != 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", + conn->c_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 ); goto cleanup; } - if( ndn == '\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 )); + LDAP_LOG( OPERATION, INFO, + "do_delete: conn %d: Attempt to delete root DSE.\n", + conn->c_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 ); + goto cleanup; + + } else if ( bvmatch( &ndn, &global_schemandn ) ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, "do_delete: conn %d: " + "Attempt to delete subschema subentry.\n", conn->c_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, @@ -99,8 +115,8 @@ do_delete( goto cleanup; } - 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, pdn.bv_val, 0, 0 ); manageDSAit = get_manageDSAit( op ); @@ -109,9 +125,14 @@ do_delete( * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ - if ( (be = select_backend( ndn, manageDSAit )) == NULL ) { + if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) { + BerVarray 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 ); + + ber_bvarray_free( ref ); goto cleanup; } @@ -124,13 +145,13 @@ do_delete( } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, dn, ndn ); + 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) @@ -140,24 +161,30 @@ 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 { + BerVarray defref = be->be_update_refs + ? be->be_update_refs : default_referral; + BerVarray 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 ); + + ber_bvarray_free( ref ); #endif } @@ -165,8 +192,9 @@ do_delete( send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, NULL, "operation not supported within namingContext", NULL, NULL ); } + cleanup: - if( ndn != NULL ) free( ndn ); - free( dn ); + free( pdn.bv_val ); + free( ndn.bv_val ); return rc; }