Make AD check server specific

config/initializers/1_settings.rb

@@ -55,9 +55,7 @@ end
 # Default settings
 Settings['ldap'] ||= Settingslogic.new({})
 Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
-Settings.ldap['allow_username_or_email_login'] = false if Settings.ldap['allow_username_or_email_login'].nil?
 Settings.ldap['sync_time'] = 3600 if Settings.ldap['sync_time'].nil?
-Settings.ldap['active_directory'] = true if Settings.ldap['active_directory'].nil?
 
 # backwards compatibility, we only have one host
 if Settings.ldap['enabled'] || Rails.env.test?
@@ -69,6 +67,8 @@ if Settings.ldap['enabled'] || Rails.env.test?
   end
 
   Settings.ldap['servers'].each do |server|
+    server['allow_username_or_email_login'] = false if server['allow_username_or_email_login'].nil?
+    server['active_directory'] = true if server['active_directory'].nil?
     server['provider_name'] = "ldap#{server['provider_id']}".downcase
     server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name'])
   end

lib/gitlab/ldap/access.rb

@@ -36,7 +36,7 @@ module Gitlab
 
       def allowed?
         if Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
-          if Gitlab.config.ldap.active_directory
+          if ldap_config.active_directory
             !Gitlab::LDAP::Person.disabled_via_active_directory?(user.extern_uid, adapter)
           end
         else