DirectoryString syntaxes must have one or more octets to be valid.

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 16c10f133c0a1c67e619c226ca6a60ec35f3ada8..f987948c1e5506a9b94c84dd43ec00ba9f7bd461 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -26,29 +26,13 @@ root_dse_info( Entry **entry, const char **text )
        struct berval   *vals[2];
        int             i, j;
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
        AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
        AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts;
        AttributeDescription *ad_supportedControl = slap_schema.si_ad_supportedControl;
        AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension;
        AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion;
        AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;
-#      ifdef SLAPD_ACI_ENABLED
-       AttributeDescription *ad_supportedACIMechanisms = slap_schema.si_ad_supportedACIMechanisms;
-#      endif
        AttributeDescription *ad_ref = slap_schema.si_ad_ref;
-#else
-       char *ad_objectClass = "objectClass";
-       char *ad_namingContexts = "namingContexts";
-       char *ad_supportedControl = "supportedControl";
-       char *ad_supportedExtension = "supportedExtension";
-       char *ad_supportedLDAPVersion = "supportedLDAPVersion";
-       char *ad_supportedSASLMechanisms = "supportedSASLMechanisms";
-#      ifdef SLAPD_ACI_ENABLED
-       char *ad_supportedACIMechanisms = "supportedACIMechanisms";
-#      endif
-       char *ad_ref = "ref";
-#endif
 
        vals[0] = &val;
        vals[1] = NULL;
@@ -109,14 +93,6 @@ root_dse_info( Entry **entry, const char **text )
                }
        }
 
-#ifdef SLAPD_ACI_ENABLED
-       /* supportedACIMechanisms */
-       for ( i=0; (val.bv_val = get_supported_acimech(i)) != NULL; i++ ) {
-               val.bv_len = strlen( val.bv_val );
-               attr_merge( e, ad_supportedACIMechanisms, vals );
-       }
-#endif
-
        if ( default_referral != NULL ) {
                attr_merge( e, ad_ref, default_referral );
        }