Fix memory leak.

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 97ca691ff2aa2ccf3fd0ceb023fdaec72e2c164e..7fd02e5eb9cb6ab532f66baa5db3436b7955c77a 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -18,7 +18,7 @@
 #include "slap.h"
 
 int
-root_dse_info( Entry **entry, char **text )
+root_dse_info( Entry **entry, const char **text )
 {
        char buf[BUFSIZ];
        Entry           *e;
@@ -33,9 +33,6 @@ root_dse_info( Entry **entry, char **text )
        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";
@@ -44,9 +41,6 @@ root_dse_info( Entry **entry, char **text )
        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
 
@@ -109,14 +103,6 @@ root_dse_info( Entry **entry, 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 );
        }