Add referral generator

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 1da0f08de99a2853379617210674a7bded95f5ae..d086e1fde1c6ed943e693cafdfab458e35adeadb 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 = NULL, *text;
+       char *dn, *ndn = NULL;
+       const char *text;
        Backend *be;
        int rc;
 
@@ -80,19 +81,23 @@ do_delete(
 
        /* make sure this backend recongizes critical controls */
        rc = backend_check_controls( be, conn, op, &text ) ;
-
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );
                goto cleanup;
        }
 
+       /* check for referrals */
+       rc = backend_check_referrals( be, conn, op, dn, ndn );
+       if ( rc != LDAP_SUCCESS ) {
+               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,
+               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 +135,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 );