#ifdef experimental controls

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index e81e38ab657f5696dc1ecf6ad264bb14e5a0effb..ccd08dc62bfb4135d676be3c230956b62d70df17 100644 (file)
--- 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 2e26823687afad1edb1ab3e39a01fe267bffeb98..7c3bf61b6bdab7126c06800d4b3bb505e0849906 100644 (file)
--- 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