From: Hallvard Furuseth <hallvard@openldap.org>
Date: Thu, 7 Jul 2005 20:36:37 +0000 (+0000)
Subject: Complete the replacement of LDAP_CONTROL_X_TREE_DELETE with
X-Git-Tag: OPENLDAP_AC_BP~435
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b1f5e9258a5123cb4e22ab3ce64dfead0a51d832;p=openldap

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 e31d3b85eb..90906ce294 100644
--- 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 5699329c6e..a3c686312c 100644
--- 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 78a41f14ab..af2fc4368b 100644
--- 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