Merge pull request #6857 from bytheway/master

Add scoping to ldap lookup when only dn given

Merge pull request #6857 from bytheway/master
Add scoping to ldap lookup when only dn given
Jacob Vosmaer
2 parents e4c8e8fd de794b6a
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
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 = {
...	...	@@ -44,7 +44,8 @@ module Gitlab
44	44	def users(field, value)
45	45	if field.to_sym == :dn
46	46	options = {
47		- base: value
	47	+ base: value,
	48	+ scope: Net::LDAP::SearchScope_BaseObject
48	49	}
49	50	else
50	51	options = {
...	...