LDAP_DEVEL cleanup from HEAD

diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index bdb382653223e69faf1b0da123bf36e555ed8f69..b67cb1d7a2c4c6f0b3a3a14563f735187baf3b8f 100644 (file)
--- 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 9be7f5399b90334ee92b748060d27f65ecbd1110..cffae770c00181157c6a0815e94ba3ace63d3729 100644 (file)
--- 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