GUACAMOLE-524: Changed addStandardTokens so user.getAttributes is called

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java

@@ -126,10 +126,6 @@ public class ConnectionService {
             TokenFilter tokenFilter = new TokenFilter();
             StandardTokens.addStandardTokens(tokenFilter, user);
 
-            // Add custom attribute tokens
-            Map<String, String> attrs = user.getAttributes();
-            StandardTokens.addAttributeTokens(tokenFilter, attrs);
-
             // Produce connections for each readable configuration
             Map<String, Connection> connections = new HashMap<String, Connection>();
             while (results.hasMore()) {

guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java

@@ -171,6 +171,8 @@ public class StandardTokens {
         // Add tokens specific to credentials
         addStandardTokens(filter, user.getCredentials());
 
+        // Add custom attribute tokens
+        addAttributeTokens(filter, user.getAttributes());
     }
 
     /**