Fix for ITS#1842 (applied blindly)

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 610ed0e786b725b01ab6a14b869c056fa18424fd..37a59aa1ea542ccd2390a3a9c5ce4e1c9bda94a3 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -52,7 +52,7 @@ 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 ));
@@ -66,7 +66,7 @@ do_delete(
 
        if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "oepration", LDAP_LEVEL_ERR,
+               LDAP_LOG(( "operation", 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 );
@@ -118,7 +118,7 @@ do_delete(
 #endif
        }
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n",
+       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 );
@@ -129,13 +129,13 @@ do_delete(
         * if we don't hold it.
         */
        if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
-               BVarray ref = referral_rewrite( default_referral,
+               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 );
 
-               bvarray_free( ref );
+               ber_bvarray_free( ref );
                goto cleanup;
        }
 
@@ -179,15 +179,15 @@ do_delete(
                        }
 #ifndef SLAPD_MULTIMASTER
                } else {
-                       BVarray defref = be->be_update_refs
+                       BerVarray defref = be->be_update_refs
                                ? be->be_update_refs : default_referral;
-                       BVarray ref = referral_rewrite( default_referral,
+                       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 );
 
-                       bvarray_free( ref );
+                       ber_bvarray_free( ref );
 #endif
                }
 
@@ -197,7 +197,6 @@ do_delete(
        }
 
 cleanup:
-       free( dn.bv_val );
        free( pdn.bv_val );
        free( ndn.bv_val );
        return rc;