cleanup experimental controls: rename macros, ifdef code

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

diff --git a/servers/slapd/back-sql/delete.c b/servers/slapd/back-sql/delete.c
index ac0f9f62a73e193f2a4c39b0c35e652a52b3997b..c04acb0a8df522ec5ff98486bea581d66d06c37e 100644 (file)
--- a/servers/slapd/back-sql/delete.c
+++ b/servers/slapd/back-sql/delete.c
@@ -499,10 +499,12 @@ backsql_delete( Operation *op, SlapReply *rs )
                break;
 
        case LDAP_COMPARE_TRUE:
+#ifdef SLAP_CONTROL_X_TREE_DELETE
                if ( get_treeDelete( op ) ) {
                        rs->sr_err = LDAP_SUCCESS;
                        break;
                }
+#endif /* SLAP_CONTROL_X_TREE_DELETE */
 
                Debug( LDAP_DEBUG_TRACE, "   backsql_delete(): "
                        "entry \"%s\" has children\n",
@@ -567,6 +569,7 @@ backsql_delete( Operation *op, SlapReply *rs )
        }
 
        e = &d;
+#ifdef SLAP_CONTROL_X_TREE_DELETE
        if ( get_treeDelete( op ) ) {
                backsql_tree_delete( op, rs, dbh, &sth );
                if ( rs->sr_err == LDAP_OTHER || rs->sr_err == LDAP_SUCCESS )
@@ -574,7 +577,9 @@ backsql_delete( Operation *op, SlapReply *rs )
                        e = NULL;
                }
 
-       } else {
+       } else
+#endif /* SLAP_CONTROL_X_TREE_DELETE */
+       {
                backsql_delete_int( op, rs, dbh, &sth, &e_id, &e );
        }