diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-06-06 18:47:49 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-06-06 18:47:49 -0500 |
| commit | 7038440e342a521807b1e5ffb6d47d4c0b13048d (patch) | |
| tree | b22cdf0ac390d0ccec2ddee46ad351d62175a993 /lib/gitlab/o_auth | |
| parent | 740a6ecba07a056fca481622b4fa89939c225987 (diff) | |
| download | gitlab-ce-7038440e342a521807b1e5ffb6d47d4c0b13048d.tar.gz | |
Adjust the SAML control flow to allow LDAP identities to be added to an existing SAML user.
Diffstat (limited to 'lib/gitlab/o_auth')
| -rw-r--r-- | lib/gitlab/o_auth/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb index 356e96fcbab..268ee115028 100644 --- a/lib/gitlab/o_auth/user.rb +++ b/lib/gitlab/o_auth/user.rb @@ -96,7 +96,7 @@ module Gitlab # Look for a corresponding person with same uid in any of the configured LDAP providers Gitlab::LDAP::Config.providers.each do |provider| adapter = Gitlab::LDAP::Adapter.new(provider) - @ldap_person = Gitlab::LDAP::Person.find_by_uid(auth_hash.uid, adapter) + @ldap_person = Gitlab::LDAP::Person.find_by_dn(auth_hash.uid, adapter) break if @ldap_person end @ldap_person |