ITS#3576 use actual backend (not glue instance) for restriction and

[openldap] / servers / slapd / back-sql / delete.c

diff --git a/servers/slapd/back-sql/delete.c b/servers/slapd/back-sql/delete.c
index 35648c5f9e67ddd135d8712a7ba9022c860f7c7f..79a8e98e54201c9d49292d176407ea45e1833b51 100644 (file)
--- a/servers/slapd/back-sql/delete.c
+++ b/servers/slapd/back-sql/delete.c
@@ -123,9 +123,8 @@ backsql_delete( Operation *op, SlapReply *rs )
                break;
 
        case LDAP_REFERRAL:
-               if ( !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
-                               dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname )
-                               && manageDSAit )
+               if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
+                               dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname ) )
                {
                        rs->sr_err = LDAP_SUCCESS;
                        rs->sr_text = NULL;
@@ -180,6 +179,9 @@ backsql_delete( Operation *op, SlapReply *rs )
                break;
 
        case LDAP_COMPARE_TRUE:
+               if ( get_treeDelete( op ) ) {
+                       /* not supported yet */ ;
+               }
                Debug( LDAP_DEBUG_TRACE, "   backsql_delete(): "
                        "entry \"%s\" has children\n",
                        op->o_req_dn.bv_val, 0, 0 );