Merge pull request #6857 from bytheway/master

Add scoping to ldap lookup when only dn given

Merge pull request #6857 from bytheway/master
b4b6447b · Jacob Vosmaer · e4c8e8fd · de794b6a · b4b6447b
Commit b4b6447b authored Apr 25, 2014 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

adapter.rb lib/gitlab/ldap/adapter.rb +2 -1

No files found.
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -44,7 +44,8 @@ module Gitlab
      def users(field, value)
        if field.to_sym == :dn
          options = {
-            base: value
+            base: value,
+            scope: Net::LDAP::SearchScope_BaseObject
          }
        else
          options = {