Added proposed request parameters to Operation. #ifdef'd, not active.

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index e7a80d0150cdc20b4864451c802f780d3e54c72e..5ab1467bc147da11f34c90817f2750edd2a32121 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -55,8 +55,6 @@ root_dse_info(
                = 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
@@ -139,7 +137,7 @@ root_dse_info(
                        }
                        continue;
                }
-               if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
+               if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) {
                        continue;
                }
                for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
@@ -158,16 +156,8 @@ root_dse_info(
        /* altServer unsupported */
 
        /* supportedControl */
-       for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {
-               vals[0].bv_len = strlen( vals[0].bv_val );
-#ifdef SLAP_NVALUES
-               if( attr_merge( e, ad_supportedControl, vals, NULL ) )
-#else
-               if( attr_merge( e, ad_supportedControl, vals ) )
-#endif
-               {
-                       return LDAP_OTHER;
-               }
+       if ( controls_root_dse_info( e ) != 0 ) {
+               return LDAP_OTHER;
        }
 
        /* supportedExtension */