Make sure the filters are applied

2014-10-14 10:08:47 +02:00 · 2014-10-14 10:08:47 +02:00 · d3056feb11
parent b229b0f003
commit d3056feb11
1 changed files with 9 additions and 8 deletions
--- a/lib/gitlab/ldap/authentication.rb
+++ b/lib/gitlab/ldap/authentication.rb
@ -48,15 +48,16 @@ module Gitlab
      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