GUACAMOLE-524: Removed unused imports, fixed comments, and condensed code
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/927c04b9 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/927c04b9 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/927c04b9 Branch: refs/heads/master Commit: 927c04b9d47aaa0089133ce7b4ae9e32d92b70b9 Parents: cb4f284 Author: Jared Frees <frees...@osu.edu> Authored: Thu Jun 21 11:02:18 2018 -0400 Committer: Jared Frees <frees...@osu.edu> Committed: Thu Jun 21 11:02:18 2018 -0400 ---------------------------------------------------------------------- .../guacamole/auth/ldap/AuthenticationProviderService.java | 6 +----- .../apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java | 4 ++-- .../main/java/org/apache/guacamole/token/StandardTokens.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/927c04b9/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java index 0845569..547b71d 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java @@ -26,9 +26,7 @@ import com.novell.ldap.LDAPAttributeSet; import com.novell.ldap.LDAPConnection; import com.novell.ldap.LDAPEntry; import com.novell.ldap.LDAPException; -import com.novell.ldap.LDAPReferralException; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.guacamole.auth.ldap.user.AuthenticatedUser; @@ -236,9 +234,7 @@ public class AuthenticationProviderService { authenticatedUser.init(credentials); // Set attributes - String username = credentials.getUsername(); - Map<String, String> attrs = getLDAPAttributes(ldapConnection, username); - authenticatedUser.setAttributes(attrs); + authenticatedUser.setAttributes(getLDAPAttributes(ldapConnection, credentials.getUsername())); return authenticatedUser; http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/927c04b9/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java index 55ed37b..6372d81 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java @@ -206,8 +206,8 @@ public class LDAPGuacamoleProperties { }; /** - * Custom attribute or attributes in Guacamole user's record in the - * LDAP directory. + * Custom attribute or attributes to query from Guacamole user's record in + * the LDAP directory. */ public static final StringListProperty LDAP_USER_ATTRIBUTES = new StringListProperty() { http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/927c04b9/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java index 5c64324..8faca15 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java @@ -182,7 +182,7 @@ public class StandardTokens { * extensions. * * @param filter - * The TokenFilter to add attributes tokens to. + * The TokenFilter to add attribute tokens to. * * @param attributes * The map of key/value pairs to add tokens for.
