X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fdelete.c;h=057206c269f8c9d425325a7b97026ef5ff65c868;hb=925714ceeff035c596ad3d3c899ff631986c6757;hp=f488fecd2c06d51c966c3a296ecc90a215a1c83c;hpb=0c28b66a7564728d8046d7e9c9840bf3e46f79f9;p=openldap diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index f488fecd2c..057206c269 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 */ /* @@ -32,16 +32,16 @@ do_delete( ) { struct berval dn = { 0, NULL }; - struct berval *ndn = NULL; - struct berval *pdn = 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 @@ -52,10 +52,10 @@ do_delete( * DelRequest := DistinguishedName */ - if ( ber_scanf( op->o_ber, "o", &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 @@ -66,20 +66,20 @@ 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; } - rc = dnPretty( NULL, &dn, &pdn ); + rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + LDAP_LOG( OPERATION, INFO, "do_delete: conn %d invalid dn (%s)\n", - conn->c_connid, dn.bv_val )); + conn->c_connid, dn.bv_val, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_delete: invalid dn (%s)\n", dn.bv_val, 0, 0 ); @@ -89,25 +89,11 @@ do_delete( goto cleanup; } - rc = dnNormalize( NULL, &dn, &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 ) { + 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 @@ -118,10 +104,10 @@ do_delete( #ifdef SLAPD_SCHEMA_DN - } else if ( strcasecmp( ndn->bv_val, SLAPD_SCHEMA_DN ) == 0 ) { + } else if ( bvmatch( &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", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_delete: subschema subentry!\n", 0, 0, 0 ); #endif @@ -133,8 +119,8 @@ do_delete( #endif } - Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n", - op->o_connid, op->o_opid, pdn->bv_val, 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 ); @@ -143,14 +129,14 @@ do_delete( * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ - if ( (be = select_backend( ndn->bv_val, manageDSAit, 0 )) == NULL ) { - struct berval **ref = referral_rewrite( default_referral, - NULL, pdn->bv_val, LDAP_SCOPE_DEFAULT ); + 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, ref ? ref : default_referral, NULL ); - ber_bvecfree( ref ); + ber_bvarray_free( ref ); goto cleanup; } @@ -163,14 +149,13 @@ do_delete( } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, pdn->bv_val, ndn->bv_val ); + rc = backend_check_referrals( be, conn, op, &pdn, &ndn ); if ( rc != LDAP_SUCCESS ) { goto cleanup; } /* deref suffix alias if appropriate */ - ndn->bv_val = suffix_alias( be, ndn->bv_val ); - ndn->bv_len = strlen( ndn->bv_val ); + suffix_alias( be, &ndn ); /* * do the delete if 1 && (2 || 3) @@ -180,30 +165,30 @@ do_delete( */ if ( be->be_delete ) { /* do the update here */ - int repl_user = be_isupdate( be, op->o_ndn ); + int repl_user = be_isupdate( be, &op->o_ndn ); #ifndef SLAPD_MULTIMASTER - if ( be->be_update_ndn == NULL || repl_user ) + if ( !be->be_update_ndn.bv_len || repl_user ) #endif { - if ( (*be->be_delete)( be, conn, op, pdn->bv_val, ndn->bv_val ) == 0 ) { + if ( (*be->be_delete)( be, conn, op, &pdn, &ndn ) == 0 ) { #ifdef SLAPD_MULTIMASTER - if (be->be_update_ndn == NULL || !repl_user ) + if ( !be->be_update_ndn.bv_len || !repl_user ) #endif { - replog( be, op, pdn->bv_val, ndn->bv_val, NULL ); + replog( be, op, &pdn, &ndn, NULL ); } } #ifndef SLAPD_MULTIMASTER } else { - struct berval **defref = be->be_update_refs + BerVarray defref = be->be_update_refs ? be->be_update_refs : default_referral; - struct berval **ref = referral_rewrite( default_referral, - NULL, pdn->bv_val, LDAP_SCOPE_DEFAULT ); + BerVarray ref = referral_rewrite( default_referral, + NULL, &pdn, LDAP_SCOPE_DEFAULT ); send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, ref ? ref : defref, NULL ); - ber_bvecfree( ref ); + ber_bvarray_free( ref ); #endif } @@ -213,8 +198,7 @@ do_delete( } cleanup: - free( dn.bv_val ); - if( pdn != NULL ) ber_bvfree( pdn ); - if( ndn != NULL ) ber_bvfree( ndn ); + free( pdn.bv_val ); + free( ndn.bv_val ); return rc; }