From 91e968bb8733612d7193fa0507781ba882803188 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sun, 6 May 2012 14:53:48 +0200
Subject: [PATCH] LDAP usernames are fine

---
 inside/ldap.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/inside/ldap.php b/inside/ldap.php
index 67a12b6..2b8d537 100644
--- a/inside/ldap.php
+++ b/inside/ldap.php
@@ -31,9 +31,6 @@ function legacy_login($username_or_email, $password) {
         if( $username_or_email === false) {
             return false;
         }
-    } else if(legacy_user_exists($username_or_email) === false) {
-        notify("Feil brukernavn eller passord.");
-        return false;
     }
     $uid = legacy_authenticate($username_or_email, $password);
     if(!$uid) {
@@ -86,7 +83,7 @@ function legacy_user_exists($username) {
     $conn = db_connect();
 
     /* get legacy_user_id */
-    $sql = sprintf("SELECT id FROM din_user WHERE username=%s", $conn->quoteSmart($username));
+    $sql = sprintf("SELECT id FROM din_user WHERE username='%s' or ldap_username='%s'", $conn->quoteSmart($username));
     $result = $conn->query($sql);
     if (DB :: isError($result) == true) {
         /* dberror */