Author: markt
Date: Mon May 12 12:15:24 2014
New Revision: 1593942

URL: http://svn.apache.org/r1593942
Log:
Correct regression introduced in r797162 that broke authentication of users 
when using the JASSMemoryLoginModule.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1593940

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1593942&r1=1593941&r2=1593942&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java 
Mon May 12 12:15:24 2014
@@ -186,7 +186,7 @@ public class JAASMemoryLoginModule exten
                 String roles[] = ((GenericPrincipal) principal).getRoles();
                 for (int i = 0; i < roles.length; i++) {
                     subject.getPrincipals().add(
-                            new GenericPrincipal(null, roles[i], null));
+                            new GenericPrincipal(roles[i], null, null));
                 }
                 
             }

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1593942&r1=1593941&r2=1593942&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 12 12:15:24 2014
@@ -173,6 +173,11 @@
         trigger threads renewal for failed contexts. Do not ignore
         <code>threadRenewalDelay</code> setting. Improve documentation. 
(kkolinko)
       </fix>
+      <fix>
+        Correct regression introduced in <rev>797162</rev> that broke
+        authentication of users when using the
+        <code>JASSMemoryLoginModule</code>. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to