Bug fix for new sockbuf code under NT. Added mutex protection against

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index b63367214ad1726b40b62f433669ede3ea01dcc3..ad6988ef9ead5ddc4cc4b4f4c8fb6b8e232a4026 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -31,7 +31,8 @@ do_delete(
     Operation  *op
 )
 {
-       char    *dn, *ndn;
+       char *dn, *ndn = NULL;
+       const char *text;
        Backend *be;
        int rc;
 
@@ -51,7 +52,7 @@ do_delete(
        }
 
        if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "do_delete: get_ctrls failed\n", 0, 0, 0 );
                goto cleanup;
        } 
 
@@ -79,20 +80,19 @@ do_delete(
        }
 
        /* make sure this backend recongizes critical controls */
-       rc = backend_check_controls( be, conn, op ) ;
+       rc = backend_check_controls( be, conn, op, &text ) ;
 
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
-                       NULL, NULL, NULL, NULL );
+                       NULL, text, NULL, NULL );
                goto cleanup;
        }
 
        if ( global_readonly || be->be_readonly ) {
                Debug( LDAP_DEBUG_ANY, "do_delete: database is read-only\n",
                       0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-                                 NULL, "database is read-only", NULL, NULL );
-               rc = LDAP_UNWILLING_TO_PERFORM;
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                                 NULL, "directory is read-only", NULL, NULL );
                goto cleanup;
        }
 
@@ -130,10 +130,10 @@ do_delete(
 
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "Function not implemented", NULL, NULL );
+                       NULL, "operation not supported within namingContext", NULL, NULL );
        }
 cleanup:
-       free( ndn );
+       if( ndn != NULL ) free( ndn );
        free( dn );
        return rc;
 }