diff options
Diffstat (limited to 'src/org/traccar/database/DataManager.java')
| -rw-r--r-- | src/org/traccar/database/DataManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |