From 67f9465138a316be53e21262c33b4aaef394767a Mon Sep 17 00:00:00 2001
From: Francois Ferrand <thetypz@gmail.com>
Date: Thu, 19 Mar 2015 17:51:22 +0100
Subject: Fix query to check user by name and email.

---
 app/Auth/Ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Auth')

diff --git a/app/Auth/Ldap.php b/app/Auth/Ldap.php
index 376d16f6..ed29199f 100644
--- a/app/Auth/Ldap.php
+++ b/app/Auth/Ldap.php
@@ -261,7 +261,7 @@ class Ldap extends Base
     private function getQuery($username, $email)
     {
         if ($username && $email) {
-            return '(&('.sprintf(LDAP_USER_PATTERN, $username).')('.sprintf(LDAP_ACCOUNT_EMAIL, $email).')';
+            return '(&('.sprintf(LDAP_USER_PATTERN, $username).')('.LDAP_ACCOUNT_EMAIL.'='.$email.'))';
         }
         else if ($username) {
             return sprintf(LDAP_USER_PATTERN, $username);
-- 
cgit v1.2.3