--- servers/slapd/root_dse.c	2004/10/01 05:33:17	1.94
+++ servers/slapd/root_dse.c	2004/10/06 03:51:39	1.95
@@ -169,7 +169,7 @@ root_dse_info(
 	/* supportedLDAPVersion */
 	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
 		char buf[BUFSIZ];
-		if (!( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_V2 ) &&
+		if (!( 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 ( SLAPD_GLOBAL(default_referral) != NULL ) {
-		if( attr_merge( e, ad_ref, SLAPD_GLOBAL(default_referral), NULL /* FIXME */ ) ) {
+	if ( default_referral != NULL ) {
+		if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {
 			return LDAP_OTHER;
 		}
 	}