Author: markt
Date: Tue Sep 30 20:00:05 2014
New Revision: 1628532
URL: http://svn.apache.org/r1628532
Log:
Cosmetic changes only to align with trunk to aid trunk/7.0.x diffs
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1628532&r1=1628531&r2=1628532&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Tue Sep 30 20:00:05 2014
@@ -138,27 +138,31 @@ public class SpnegoAuthenticator extends
Principal principal = request.getUserPrincipal();
String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
if (principal != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Already authenticated '" + principal.getName() +
"'");
+ }
// Associate the session with any existing SSO session
- if (ssoId != null)
+ if (ssoId != null) {
associate(ssoId, request.getSessionInternal(true));
+ }
return true;
}
// Is there an SSO session against which we can try to reauthenticate?
if (ssoId != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("SSO Id " + ssoId + " set; attempting " +
"reauthentication");
+ }
/* Try to reauthenticate using data cached by SSO. If this fails,
either the original SSO logon was of DIGEST or SSL (which
we can't reauthenticate ourselves because there is no
cached username and password), or the realm denied
the user's reauthentication for some reason.
In either case we have to prompt the user for a logon */
- if (reauthenticateFromSSO(ssoId, request))
+ if (reauthenticateFromSSO(ssoId, request)) {
return true;
+ }
}
MessageBytes authorization =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
