From 9cc7ba4e9a1dfceba1b88e32a35915f513b3a688 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 27 Nov 2017 17:20:35 +0500
Subject: - Fix local login if ldap enabled - Do not allow user edit own "Limit
 Command" permission

---
 src/org/traccar/database/DataManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/org/traccar/database/DataManager.java')

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index abc424ff9..f813426d3 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -307,7 +307,7 @@ public class DataManager {
                 .executeQuerySingle(User.class);
         LdapProvider ldapProvider = Context.getLdapProvider();
         if (user != null) {
-            if (ldapProvider != null && ldapProvider.login(user.getLogin(), password)
+            if (ldapProvider != null && user.getLogin() != null && ldapProvider.login(user.getLogin(), password)
                     || !forceLdap && user.isPasswordValid(password)) {
                 return user;
             }
-- 
cgit v1.2.3