From eed54d6198fe8d4c64652260b335c2df90e298eb Mon Sep 17 00:00:00 2001
From: mposolda <mposolda@gmail.com>
Date: Wed, 11 Feb 2015 19:11:03 +0100
Subject: [PATCH] Just display login with warning if Kerberos login failed

---
 .../keycloak/broker/kerberos/KerberosIdentityProvider.java  | 6 ++++--
 .../resources/theme/login/base/messages/messages.properties | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/broker/kerberos/src/main/java/org/keycloak/broker/kerberos/KerberosIdentityProvider.java b/broker/kerberos/src/main/java/org/keycloak/broker/kerberos/KerberosIdentityProvider.java
index fc7db82149..56b30fd141 100644
--- a/broker/kerberos/src/main/java/org/keycloak/broker/kerberos/KerberosIdentityProvider.java
+++ b/broker/kerberos/src/main/java/org/keycloak/broker/kerberos/KerberosIdentityProvider.java
@@ -107,9 +107,11 @@ public class KerberosIdentityProvider extends AbstractIdentityProvider<KerberosI
         Response response = request.getSession().getProvider(LoginFormsProvider.class)
                 .setRealm(request.getRealm())
                 .setUriInfo(request.getUriInfo())
-                .setError("errorKerberosLogin")
+                .setClient(request.getClientSession().getClient())
+                .setClientSessionCode(getRelayState(request))
+                .setWarning("errorKerberosLogin")
                 .setStatus(Response.Status.UNAUTHORIZED)
-                .createErrorPage();
+                .createLogin();
 
         response.getMetadata().putSingle(HttpHeaders.WWW_AUTHENTICATE, negotiateHeader);
         return AuthenticationResponse.fromResponse(response);
diff --git a/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties b/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
index 5026413b5a..3819d67db8 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
+++ b/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
@@ -98,7 +98,7 @@ actionPasswordWarning=You need to change your password to activate your account.
 actionEmailWarning=You need to verify your email address to activate your account.
 actionFollow=Please fill in the fields below.
 
-errorKerberosLogin=Unable to login with Kerberos
+errorKerberosLogin=Unable to login with Kerberos. Request Kerberos ticket or use different login mechanism
 
 successHeader=Success!
 errorHeader=Error!