ITS#3353 consolidate slapd globals into a single struct

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 642decbc88d850bc63855f95d17e01595b4f307c..96450daa39db0b243d133681a8f5d290f15c2ad2 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -169,7 +169,7 @@ root_dse_info(
        /* supportedLDAPVersion */
        for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
                char buf[BUFSIZ];
-               if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
+               if (!( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_V2 ) &&
                        ( i < LDAP_VERSION3 ) )
                {
                        /* version 2 and lower are disallowed */
@@ -197,8 +197,8 @@ root_dse_info(
                ldap_charray_free( supportedSASLMechanisms );
        }
 
-       if ( default_referral != NULL ) {
-               if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {
+       if ( SLAPD_GLOBAL(default_referral) != NULL ) {
+               if( attr_merge( e, ad_ref, SLAPD_GLOBAL(default_referral), NULL /* FIXME */ ) ) {
                        return LDAP_OTHER;
                }
        }