ITS#3353 consolidate slapd globals into a single struct

[openldap] / servers / slapd / back-relay / op.c

diff --git a/servers/slapd/back-relay/op.c b/servers/slapd/back-relay/op.c
index 881e77a8301c0a394edfdf8eaee2c7387afc9f56..dca3de486fba2c82ae7cb80267125b32e2f88b58 100644 (file)
--- a/servers/slapd/back-relay/op.c
+++ b/servers/slapd/back-relay/op.c
@@ -66,17 +66,17 @@ relay_back_select_backend( struct slap_op *op, struct slap_rep *rs, int err )
        }
 
        if ( bd == NULL ) {
-               if ( default_referral ) {
-                       rs->sr_ref = referral_rewrite( default_referral,
+               if ( SLAPD_GLOBAL(default_referral) ) {
+                       rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
                                NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
                        if ( !rs->sr_ref ) {
-                               rs->sr_ref = default_referral;
+                               rs->sr_ref = SLAPD_GLOBAL(default_referral);
                        }
 
                        rs->sr_err = LDAP_REFERRAL;
                        send_ldap_result( op, rs );
 
-                       if ( rs->sr_ref != default_referral ) {
+                       if ( rs->sr_ref != SLAPD_GLOBAL(default_referral) ) {
                                ber_bvarray_free( rs->sr_ref );
                        }