From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 29 Mar 2011 20:10:48 +0000 (+0000)
Subject: Fix some TODOs
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e1b0e8263a41011289b1ee852a758e1a351a5e35;p=tomcat7.0

Fix some TODOs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1086709 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties b/java/org/apache/catalina/authenticator/LocalStrings.properties
index b1ed7e62d..b94207a26 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -29,3 +29,7 @@ authenticator.userDataConstraint=This request violates a User Data constraint fo
 
 formAuthenticator.forwardErrorFail=Unexpected error forwarding to error page
 formAuthenticator.forwardLoginFail=Unexpected error forwarding to login page
+
+spnegoAuthenticator.hostnameFail=Unable to determine the host name to construct the default SPN. Please set the spn attribute of the authenticator.
+spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
+spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied ticket
\ No newline at end of file
diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
index 6a3013a79..d4dff6e9a 100644
--- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
@@ -138,8 +138,8 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
             try {
                 name.append(InetAddress.getLocalHost().getCanonicalHostName());
             } catch (UnknownHostException e) {
-                // TODO add a message
-                throw new LifecycleException(e);
+                throw new LifecycleException(
+                        sm.getString("spnegoAuthenticator.hostnameFail"), e);
             }
             serviceProvideName = name.toString();
         } else {
@@ -154,8 +154,8 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
             lc.login();
             serviceSubject = lc.getSubject();
         } catch (LoginException e) {
-            // TODO add a message
-            throw new LifecycleException(e);
+            throw new LifecycleException(
+                    sm.getString("spnegoAuthenticator.serviceLoginFail"), e);
         }
     }
 
@@ -211,8 +211,10 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
                             new KerberosAuthAction(decoded.getBytes(),
                                     response, context));
                 } catch (PrivilegedActionException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
+                    if (log.isDebugEnabled()) {
+                        log.debug(sm.getString(
+                                "spnegoAuthenticator.ticketValidateFail"));
+                    }
                 }
                 
                 if (principal != null) {