From d1f5019511a1dc630e97f99bdb1f6b9fe6b02bba Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 2 May 2016 13:19:39 +0200
Subject: [PATCH] Use correct auth finder

---
 lib/api/session.rb               | 7 +------
 lib/gitlab/backend/grack_auth.rb | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/api/session.rb b/lib/api/session.rb
index e308ccc3004..1156aab8cc2 100644
--- a/lib/api/session.rb
+++ b/lib/api/session.rb
@@ -11,12 +11,7 @@ module API
     # Example Request:
     #  POST /session
     post "/session" do
-      user, _ = Gitlab::Auth.find(
-        params[:email] || params[:login],
-        params[:password],
-        project: nil,
-        ip: request.ip
-      )
+      user = Gitlab::Auth.find_by_master_or_ldap(params[:email] || params[:login], params[:password])
 
       return unauthorized! unless user
       present user, with: Entities::UserLogin
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index b263a27d4d3..3462c2dcfbc 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -95,7 +95,7 @@ module Grack
     end
 
     def authenticate_user(login, password)
-      user, _ = Gitlab::Auth.new.find_by_master_or_ldap(login, password)
+      user = Gitlab::Auth.new.find_by_master_or_ldap(login, password)
 
       unless user
         user = oauth_access_token_check(login, password)
-- 
GitLab