Very crude LDIF changes:

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 13c099b597cb92854897a035fdb4baa17dca2572..1b32dd9a0d0669436dfc4fae4931065a8be83c90 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -31,6 +31,14 @@ do_delete(
 
        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;
+       }
+
        /*
         * Parse the delete request.  It looks like this:
         *
@@ -39,22 +47,26 @@ do_delete(
 
        if ( ber_scanf( op->o_ber, "a", &ndn ) == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL, "" );
+               send_ldap_disconnect( conn, op,
+                       LDAP_PROTOCOL_ERROR, "decoding error" );
+               return -1;
+       }
+
+       if(     dn_normalize_case( ndn ) == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "do_delete: invalid dn (%s)\n", ndn, 0, 0 );
+               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+                   "invalid DN", NULL, NULL );
+               free( ndn );
                return rc;
        }
 
-#ifdef GET_CTRLS
        if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) {
                free( ndn );
                Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
                return rc;
        } 
-#endif
 
        Debug( LDAP_DEBUG_ARGS, "do_delete: dn (%s)\n", ndn, 0, 0 );
-
-       dn_normalize_case( ndn );
-
        Debug( LDAP_DEBUG_STATS, "DEL dn=\"%s\"\n", ndn, 0, 0 );
 
        /*
@@ -63,14 +75,14 @@ do_delete(
         * if we don't hold it.
         */
        if ( (be = select_backend( ndn )) == NULL ) {
+               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+                       NULL, NULL, default_referral, NULL );
                free( ndn );
-               send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, NULL,
-                   default_referral );
                return rc;
        }
 
-       /* alias suffix if approp */
-       ndn = suffixAlias( ndn, op, be );
+       /* deref suffix alias if appropriate */
+       ndn = suffix_alias( be, ndn );
 
        /*
         * do the delete if 1 && (2 || 3)
@@ -84,15 +96,15 @@ do_delete(
                        strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
                {
                        if ( (*be->be_delete)( be, conn, op, ndn ) == 0 ) {
-                               replog( be, LDAP_REQ_DELETE, ndn, NULL, 0 );
+                               replog( be, op, ndn, NULL );
                        }
                } else {
-                       send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, NULL,
-                           default_referral );
+                       send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
+                               be->be_update_refs ? be->be_update_refs : default_referral, NULL );
                }
        } else {
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "Function not implemented" );
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "Function not implemented", NULL, NULL );
        }
 
        free( ndn );