Author: markt
Date: Tue Mar 29 20:10:48 2011
New Revision: 1086709
URL: http://svn.apache.org/viewvc?rev=1086709&view=rev
Log:
Fix some TODOs
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties?rev=1086709&r1=1086708&r2=1086709&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
Tue Mar 29 20:10:48 2011
@@ -29,3 +29,7 @@ authenticator.userDataConstraint=This re
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
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1086709&r1=1086708&r2=1086709&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Tue Mar 29 20:10:48 2011
@@ -138,8 +138,8 @@ public class SpnegoAuthenticator extends
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
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
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
