Per ITS#419, don't require SLAPD_RLOOKUPS when HAVE_TCPD

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 64cbefa67557439f96a1a6ef79eb39ec1bd28570..77b2f4098a1e76f37cdb4af0c7110a0126c8795b 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
@@ -17,6 +22,7 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
+#include "ldap_pvt.h"
 #include "slap.h"
 
 int
@@ -25,7 +31,7 @@ do_delete(
     Operation  *op
 )
 {
-       char    *ndn;
+       char    *dn, *ndn;
        Backend *be;
        int rc;
 
@@ -45,29 +51,29 @@ do_delete(
         *      DelRequest := DistinguishedName
         */
 
-       if ( ber_scanf( op->o_ber, "a", &ndn ) == LBER_ERROR ) {
+       if ( ber_scanf( op->o_ber, "a", &dn ) == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
                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 );
+       ndn = ch_strdup( dn );
+
+       if(     dn_normalize( ndn ) == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "do_delete: invalid dn (%s)\n", dn, 0, 0 );
                send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
                    "invalid DN", NULL, NULL );
-               free( ndn );
-               return rc;
+               goto cleanup;
        }
 
        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;
+               goto cleanup;
        } 
 
-       Debug( LDAP_DEBUG_ARGS, "do_delete: dn (%s)\n", ndn, 0, 0 );
-       Debug( LDAP_DEBUG_STATS, "DEL dn=\"%s\"\n", ndn, 0, 0 );
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n",
+               op->o_connid, op->o_opid, dn, 0, 0 );
 
        /*
         * We could be serving multiple database backends.  Select the
@@ -77,8 +83,24 @@ do_delete(
        if ( (be = select_backend( ndn )) == NULL ) {
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, default_referral, NULL );
-               free( ndn );
-               return rc;
+               goto cleanup;
+       }
+
+       /* make sure this backend recongizes critical controls */
+       rc = backend_check_controls( be, conn, op ) ;
+
+       if( rc != LDAP_SUCCESS ) {
+               send_ldap_result( conn, op, rc,
+                       NULL, NULL, NULL, NULL );
+       }
+
+       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;
+               goto cleanup;
        }
 
        /* deref suffix alias if appropriate */
@@ -92,21 +114,33 @@ do_delete(
         */
        if ( be->be_delete ) {
                /* do the update here */
+#ifndef SLAPD_MULTIMASTER
                if ( be->be_update_ndn == NULL ||
                        strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+#endif
                {
-                       if ( (*be->be_delete)( be, conn, op, ndn ) == 0 ) {
-                               replog( be, LDAP_REQ_DELETE, ndn, NULL, 0 );
+                       if ( (*be->be_delete)( be, conn, op, dn, ndn ) == 0 ) {
+#ifdef SLAPD_MULTIMASTER
+                               if (be->be_update_ndn == NULL ||
+                                       strcmp( be->be_update_ndn, op->o_ndn ))
+#endif
+                               {
+                                       replog( be, op, dn, NULL );
+                               }
                        }
+#ifndef SLAPD_MULTIMASTER
                } else {
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
                                be->be_update_refs ? be->be_update_refs : default_referral, NULL );
+#endif
                }
+
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
                        NULL, "Function not implemented", NULL, NULL );
        }
-
+cleanup:
        free( ndn );
+       free( dn );
        return rc;
 }