aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-13 17:41:04 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-13 17:41:04 +1200
commit408758d371eaeb2ce25c1e8214f591200e741aaf (patch)
treea266c7f98d692e6e73e9be50bb42d8675370fa5d /src/org/traccar/database
parentfc75fe4ab4f8ea9de58c41772fdd92c10c73f2bc (diff)
downloadtrackermap-server-408758d371eaeb2ce25c1e8214f591200e741aaf.tar.gz
trackermap-server-408758d371eaeb2ce25c1e8214f591200e741aaf.tar.bz2
trackermap-server-408758d371eaeb2ce25c1e8214f591200e741aaf.zip
Fix minor permissions issues
Diffstat (limited to 'src/org/traccar/database')
-rw-r--r--src/org/traccar/database/DataManager.java4
-rw-r--r--src/org/traccar/database/PermissionsManager.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index bab785a96..4b9aacbbf 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -168,7 +168,9 @@ public class DataManager {
admin.setEmail("admin");
admin.setPassword("admin");
admin.setAdmin(true);
- addUser(admin);
+ QueryBuilder.create(dataSource, properties.getProperty("database.insertUser"))
+ .setObject(admin)
+ .executeUpdate();
Server server = new Server();
server.setRegistration(true);
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index f34fecb08..683f54cb4 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -75,7 +75,7 @@ public class PermissionsManager {
}
public void checkDevice(long userId, long deviceId) throws SecurityException {
- if (getNotNull(userId).contains(deviceId)) {
+ if (!getNotNull(userId).contains(deviceId)) {
throw new SecurityException("Device access denied");
}
}