GUACAMOLE-5: Merge change to provided latest UserContext to updateUserContext().

This commit is contained in:
James Muehlner
2016-07-30 11:33:49 -07:00
6 changed files with 23 additions and 11 deletions

View File

@@ -95,7 +95,8 @@ public abstract class InjectedAuthenticationProvider implements AuthenticationPr
@Override
public UserContext updateUserContext(UserContext context,
AuthenticatedUser authenticatedUser) throws GuacamoleException {
AuthenticatedUser authenticatedUser, Credentials credentials)
throws GuacamoleException {
// No need to update the context
return context;

View File

@@ -20,8 +20,6 @@
package org.apache.guacamole.auth.ldap;
import org.apache.guacamole.auth.ldap.AuthenticationProviderService;
import org.apache.guacamole.auth.ldap.LDAPAuthenticationProviderModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.apache.guacamole.GuacamoleException;
@@ -97,7 +95,8 @@ public class LDAPAuthenticationProvider implements AuthenticationProvider {
@Override
public UserContext updateUserContext(UserContext context,
AuthenticatedUser authenticatedUser) throws GuacamoleException {
AuthenticatedUser authenticatedUser,
Credentials credentials) throws GuacamoleException {
return context;
}