From bb2f3beedcb59aa518d6fcc192827b8574e28e25 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 18 Aug 2006 06:30:12 +0000
Subject: [PATCH] LDAP_DEVEL cleanup from HEAD
---
servers/slapd/back-ldap/distproc.c | 2 ++
servers/slapd/root_dse.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index bdb3826532..b67cb1d7a2 100644
--- a/servers/slapd/back-ldap/distproc.c
+++ b/servers/slapd/back-ldap/distproc.c
@@ -958,6 +958,7 @@ distproc_initialize( void )
return rc;
}
+#ifdef LDAP_DEVEL
rc = supported_feature_load( &slap_FEATURE_CANCHAINOPS );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
@@ -965,6 +966,7 @@ distproc_initialize( void )
rc, 0, 0 );
return rc;
}
+#endif
rc = register_supported_control( LDAP_CONTROL_X_RETURNCONTREF,
SLAP_CTRL_GLOBAL|SLAP_CTRL_ACCESS|SLAP_CTRL_HIDE, NULL,
diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 9be7f5399b..cffae770c0 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -35,7 +35,7 @@ static struct berval builtin_supportedFeatures[] = {
BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */
BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */
-#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
+#ifdef LDAP_DEVEL
BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */
#endif
BER_BVNULL
--
GitLab