Make sure the filters are applied

gitlabhq · Oct 14, 2014 · d3056fe · d3056fe
1 parent b229b0f
commit d3056fe
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/lib/gitlab/ldap/authentication.rb b/lib/gitlab/ldap/authentication.rb
@@ -48,15 +48,16 @@ def config
       end
 
       def user_filter(login)
-        Net::LDAP::Filter.eq(config.uid, login).tap do |filter|
-          # Apply LDAP user filter if present
-          if config.user_filter.present?
-            Net::LDAP::Filter.join(
-              filter,
-              Net::LDAP::Filter.construct(config.user_filter)
-            )
-          end
+        filter = Net::LDAP::Filter.eq(config.uid, login)
+
+        # Apply LDAP user filter if present
+        if config.user_filter.present?
+          filter = Net::LDAP::Filter.join(
+            filter,
+            Net::LDAP::Filter.construct(config.user_filter)
+          )
         end
+        filter
       end
 
       def user