From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 18 Feb 2002 19:48:27 +0000 (+0000)
Subject: #ifdef experimental controls
X-Git-Tag: OPENLDAP_REL_ENG_2_MP~403
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=348e489b35d527e8cbb321b7058bb98cd567890a;p=openldap

#ifdef experimental controls
---

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index e81e38ab65..ccd08dc62b 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -405,8 +405,12 @@ bdb_initialize(
 {
 	static char *controls[] = {
 		LDAP_CONTROL_MANAGEDSAIT,
+#ifdef LDAP_CONTROL_SUBENTRIES
 		LDAP_CONTROL_SUBENTRIES,
+#endif
+#ifdef LDAP_CONTROL_NOOP
 		LDAP_CONTROL_NOOP,
+#endif
 		NULL
 	};
 
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 2e26823687..7c3bf61b6b 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -57,9 +57,11 @@ static struct slap_control {
 	{ LDAP_CONTROL_MANAGEDSAIT,
 		SLAP_CTRL_ACCESS, NULL,
 		parseManageDSAit },
+#ifdef LDAP_CONTROL_SUBENTRIES
 	{ LDAP_CONTROL_SUBENTRIES,
 		SLAP_CTRL_SEARCH, NULL,
 		parseSubentries },
+#endif
 #ifdef LDAP_CONTROL_NOOP
 	{ LDAP_CONTROL_NOOP,
 		SLAP_CTRL_UPDATE, NULL,
@@ -384,6 +386,7 @@ static int parseManageDSAit (
 	return LDAP_SUCCESS;
 }
 
+#ifdef LDAP_CONTROL_SUBENTRIES
 static int parseSubentries (
 	Connection *conn,
 	Operation *op,
@@ -412,7 +415,9 @@ static int parseSubentries (
 
 	return LDAP_SUCCESS;
 }
+#endif
 
+#ifdef LDAP_CONTROL_NOOP
 static int parseNoOp (
 	Connection *conn,
 	Operation *op,
@@ -435,4 +440,5 @@ static int parseNoOp (
 
 	return LDAP_SUCCESS;
 }
+#endif