Prepare for unifdef -DSLAPD_SCHEMA_NOT_COMPAT

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 7791ed227a44785f4916eb2d424eccadcc61f9af..ad6988ef9ead5ddc4cc4b4f4c8fb6b8e232a4026 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -31,7 +31,8 @@ do_delete(
     Operation  *op
 )
 {
-       char    *dn, *ndn = NULL, *text;
+       char *dn, *ndn = NULL;
+       const char *text;
        Backend *be;
        int rc;
 
@@ -90,9 +91,8 @@ do_delete(
        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,
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
                                  NULL, "directory is read-only", NULL, NULL );
-               rc = LDAP_UNWILLING_TO_PERFORM;
                goto cleanup;
        }
 
@@ -130,7 +130,7 @@ do_delete(
 
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "delete function not implemented", NULL, NULL );
+                       NULL, "operation not supported within namingContext", NULL, NULL );
        }
 cleanup:
        if( ndn != NULL ) free( ndn );