Author: markt
Date: Mon May 12 12:10:05 2014
New Revision: 1593940

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

Modified:
    tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1593940&r1=1593939&r2=1593940&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Mon 
May 12 12:10:05 2014
@@ -182,7 +182,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/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593940&r1=1593939&r2=1593940&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May 12 12:10:05 2014
@@ -183,8 +183,13 @@
         <code>threadRenewalDelay</code> setting. Improve documentation. 
(kkolinko)
       </fix>
       <fix>
-        Fix regression introduced in <rev>1239520</rev> that broke loading of
-        users from <code>tomcat-users.xml</code> when using the
+        Correct regression introduced in <rev>1239520</rev> that broke loading
+        of users from <code>tomcat-users.xml</code> when using the
+        <code>JASSMemoryLoginModule</code>. (markt)
+      </fix>
+      <fix>
+        Correct regression introduced in <rev>797162</rev> that broke
+        authentication of users when using the
         <code>JASSMemoryLoginModule</code>. (markt)
       </fix>
     </changelog>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to