error message from be_entry_put tool backend function

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 5d10e369d7a00c04fcb7ecfb8d5a8b3a50a53df2..362f1b915a3fe5f1dd343a15dbed6f07675c452a 100644 (file)
--- 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,7 +31,9 @@ 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;
@@ -39,7 +41,7 @@ do_delete(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                  "do_delete: conn %d\n", conn->c_connid ));
+               "do_delete: conn %d\n", conn->c_connid ));
 #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 ));
+                       "do_delete: conn: %d  ber_scanf failed\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -65,28 +67,29 @@ 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 ));
+                       "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;
        } 
 
-       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", 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, 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 ));
@@ -99,7 +102,8 @@ do_delete(
                goto cleanup;
 
 #ifdef SLAPD_SCHEMA_DN
-       } else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+
+       } 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 ));
@@ -115,7 +119,7 @@ do_delete(
        }
 
        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 );
 
@@ -124,14 +128,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 ) {
-               struct berval **ref = referral_rewrite( default_referral,
-                       NULL, dn, LDAP_SCOPE_DEFAULT );
+       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 );
 
-               ber_bvecfree( ref );
+               bvarray_free( ref );
                goto cleanup;
        }
 
@@ -144,13 +148,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)
@@ -160,30 +164,30 @@ do_delete(
         */
        if ( be->be_delete ) {
                /* do the update here */
+               int repl_user = be_isupdate( be, &op->o_ndn );
 #ifndef SLAPD_MULTIMASTER
-               int repl_user = be_isupdate( be, op->o_ndn );
-               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, dn, ndn ) == 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, dn, NULL );
+                                       replog( be, op, &pdn, &ndn, NULL );
                                }
                        }
 #ifndef SLAPD_MULTIMASTER
                } else {
-                       struct berval **defref = be->be_update_refs
+                       BVarray defref = be->be_update_refs
                                ? be->be_update_refs : default_referral;
-                       struct berval **ref = referral_rewrite( default_referral,
-                               NULL, dn, LDAP_SCOPE_DEFAULT );
+                       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 );
 
-                       ber_bvecfree( ref );
+                       bvarray_free( ref );
 #endif
                }
 
@@ -191,8 +195,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;
 }