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

GUAC-1388: Correct whitespace errors. Remove unrelated reformatting.

Browse Source
This commit is contained in:
Michael Jumper
2016-01-22 08:28:02 -08:00
parent a9b8fce84d
commit 84eb4d8598
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java
View File

@@ -64,8 +64,8 @@ public class LDAPGuacamoleProperties {
}; };
/** /**
* The base DN of role based access control (RBAC) groups. * The base DN of role based access control (RBAC) groups. All groups
* All groups should be under this DN. * should be under this DN.
*/ */
public static final StringGuacamoleProperty LDAP_GROUP_BASE_DN = new StringGuacamoleProperty() { public static final StringGuacamoleProperty LDAP_GROUP_BASE_DN = new StringGuacamoleProperty() {

11
extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/connection/ConnectionService.java
View File

@@ -96,9 +96,8 @@ public class ConnectionService {
// Do not return any connections if base DN is not specified // Do not return any connections if base DN is not specified
String configurationBaseDN = confService.getConfigurationBaseDN(); String configurationBaseDN = confService.getConfigurationBaseDN();
if (configurationBaseDN == null) { if (configurationBaseDN == null)
return Collections.<String, Connection>emptyMap(); return Collections.<String, Connection>emptyMap();
}
try { try {
@@ -195,7 +194,8 @@ public class ConnectionService {
// Return map of all connections // Return map of all connections
return connections; return connections;
} catch (LDAPException e) { }
catch (LDAPException e) {
throw new GuacamoleServerException("Error while querying for connections.", e); throw new GuacamoleServerException("Error while querying for connections.", e);
} }
@@ -219,7 +219,9 @@ public class ConnectionService {
* @throws GuacamoleException * @throws GuacamoleException
* If an error occurs retrieving the group base DN. * If an error occurs retrieving the group base DN.
*/ */
private String getConnectionSearchFilter(String userDN, LDAPConnection ldapConnection) throws LDAPException, GuacamoleException { private String getConnectionSearchFilter(String userDN,
LDAPConnection ldapConnection)
throws LDAPException, GuacamoleException {
// Create a search filter for the connection search // Create a search filter for the connection search
StringBuilder connectionSearchFilter = new StringBuilder(); StringBuilder connectionSearchFilter = new StringBuilder();
@@ -231,7 +233,6 @@ public class ConnectionService {
// If group base DN is specified search for user groups // If group base DN is specified search for user groups
String groupBaseDN = confService.getGroupBaseDN(); String groupBaseDN = confService.getGroupBaseDN();
if (groupBaseDN != null) { if (groupBaseDN != null) {
// Get all groups the user is a member of starting at the groupBaseDN, excluding guacConfigGroups // Get all groups the user is a member of starting at the groupBaseDN, excluding guacConfigGroups