Complete the replacement of LDAP_CONTROL_X_TREE_DELETE with

SLAP_CONTROL_X_TREE_DELETE, which is only defiend when LDAP_DEVEL.
back-sql triggered an assert(0): It expected the control to be supported.

diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index e31d3b85eb470b856aa982199c2de1f741bdb367..90906ce294639b56cfe0531891f05cfa36d6e8cd 100644 (file)
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -39,9 +39,9 @@ sql_back_initialize(
 #if 0 /* needs improvements */
                LDAP_CONTROL_NOOP,
 #endif
-#ifdef LDAP_CONTROL_X_TREE_DELETE
-               LDAP_CONTROL_X_TREE_DELETE,
-#endif /* LDAP_CONTROL_X_TREE_DELETE */
+#ifdef SLAP_CONTROL_X_TREE_DELETE
+               SLAP_CONTROL_X_TREE_DELETE,
+#endif /* SLAP_CONTROL_X_TREE_DELETE */
                NULL
        };
 

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 5699329c6efa64eb0c135f62086310cff94d8831..a3c686312c76526bdb717c6bfdfa09e867a68154 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -41,7 +41,9 @@ static SLAP_CTRL_PARSE_FN parseSortedResults;
 static SLAP_CTRL_PARSE_FN parseValuesReturnFilter;
 static SLAP_CTRL_PARSE_FN parsePermissiveModify;
 static SLAP_CTRL_PARSE_FN parseDomainScope;
+#ifdef SLAP_CONTROL_X_TREE_DELETE
 static SLAP_CTRL_PARSE_FN parseTreeDelete;
+#endif
 static SLAP_CTRL_PARSE_FN parseSearchOptions;
 static SLAP_CTRL_PARSE_FN parseSubentries;
 
@@ -1325,7 +1327,7 @@ static int parseDomainScope (
 }
 #endif
 
-#ifdef LDAP_CONTROL_X_TREE_DELETE
+#ifdef SLAP_CONTROL_X_TREE_DELETE
 static int parseTreeDelete (
        Operation *op,
        SlapReply *rs,

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 78a41f14ab125800cf8d5fbd906e538c74653211..af2fc4368b6804c440a7f46a483699f82fb5f063 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2429,7 +2429,7 @@ typedef struct slap_op {
 #define get_domainScope(op)                            (0)
 #endif
 
-#ifdef LDAP_CONTROL_X_TREE_DELETE
+#ifdef SLAP_CONTROL_X_TREE_DELETE
 #define        o_tree_delete   o_ctrlflag[slap_cids.sc_treeDelete]
 #define get_treeDelete(op)                             ((int)(op)->o_tree_delete)
 #else