safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #269: Remove user ID stubs from permission update routine.

Browse Source
This commit is contained in:
Michael Jumper
2013-02-26 00:22:43 -08:00
parent c49a4bee92
commit aa97d7d42e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
View File

@@ -469,7 +469,7 @@ public class UserDirectory implements Directory<String, net.sourceforge.guacamol
ConnectionPermissionKey newPermission = new ConnectionPermissionKey(); ConnectionPermissionKey newPermission = new ConnectionPermissionKey();
newPermission.setConnection_id(dbConnection.getConnection_id()); newPermission.setConnection_id(dbConnection.getConnection_id());
newPermission.setPermission(permission.getType().name()); newPermission.setPermission(permission.getType().name());
newPermission.setConnection_id(user_id); newPermission.setUser_id(user_id);
connectionPermissionDAO.insert(newPermission); connectionPermissionDAO.insert(newPermission);
} }
} }
@@ -684,8 +684,8 @@ public class UserDirectory implements Directory<String, net.sourceforge.guacamol
userDAO.updateByPrimaryKeySelective(mySQLUser.toUserWithBLOBs()); userDAO.updateByPrimaryKeySelective(mySQLUser.toUserWithBLOBs());
// Update permissions in database // Update permissions in database
createPermissions(0 /* STUB */, mySQLUser.getNewPermissions()); createPermissions(mySQLUser.getUserID(), mySQLUser.getNewPermissions());
removePermissions(0 /* STUB */, mySQLUser.getRemovedPermissions()); removePermissions(mySQLUser.getUserID(), mySQLUser.getRemovedPermissions());
// The appropriate permissions have been inserted and deleted, so // The appropriate permissions have been inserted and deleted, so
// reset the new and removed permission sets. // reset the new and removed permission sets.