More system schema checks

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index ff72b78fdfd1068c028cce9ea86af75beab62e3b..d066423ed52c4ca6930fc17c50c867a29736febc 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -87,8 +87,9 @@ root_dse_info(
        attr_merge( e, ad_objectClass, vals );
 
        for ( i = 0; i < nbackends; i++ ) {
-               if ( backends[i].be_glueflags & SLAP_GLUE_SUBORDINATE )
+               if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
                        continue;
+               }
                for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
                        vals[0] = *backends[i].be_suffix[j];
                        attr_merge( e, ad_namingContexts, vals );
@@ -98,8 +99,7 @@ root_dse_info(
        /* altServer unsupported */
 
        /* supportedControl */
-       for ( i=0; supportedControls[i] != NULL; i++ ) {
-               vals[0].bv_val = supportedControls[i];
+       for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {
                vals[0].bv_len = strlen( vals[0].bv_val );
                attr_merge( e, ad_supportedControl, vals );
        }