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

GUAC-1115: Treat empty lists as blank.

Browse Source
This commit is contained in:
Michael Jumper
2015-10-20 15:21:47 -07:00
parent cbfcd8b1e4
commit 1c7794b870
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/AuthenticationProviderService.java
View File

@@ -95,8 +95,6 @@ public class AuthenticationProviderService {
// Pull username attributes from properties
List<String> usernameAttributes = confService.getUsernameAttributes();
if (usernameAttributes.isEmpty())
return null;
// We need exactly one base DN to derive the user DN
if (usernameAttributes.size() != 1)

6
extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/StringListProperty.java
View File

@@ -56,7 +56,11 @@ public abstract class StringListProperty implements GuacamoleProperty<List<Strin
return null;
// Split string into a list of individual values
return Arrays.asList(DELIMITER_PATTERN.split(values));
List<String> stringValues = Arrays.asList(DELIMITER_PATTERN.split(values));
if (stringValues.isEmpty())
return null;
return stringValues;
}