Author: markt
Date: Sat Sep 9 14:09:49 2006
New Revision: 441855
URL: http://svn.apache.org/viewvc?view=rev&rev=441855
Log:
Clean up code and fix logic error noticed whilst doing so.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java?view=diff&rev=441855&r1=441854&r2=441855
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
Sat Sep 9 14:09:49 2006
@@ -32,7 +32,6 @@
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.users.MemoryUser;
import org.apache.catalina.util.StringManager;
@@ -223,7 +222,7 @@
Iterator groups = user.getGroups();
while(groups.hasNext()) {
Group group = (Group)groups.next();
- uroles = user.getRoles();
+ uroles = group.getRoles();
while(uroles.hasNext()) {
Role role = (Role)uroles.next();
roles.add(role.getName());
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=441855&r1=441854&r2=441855
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Sep 9 14:09:49 2006
@@ -15,11 +15,20 @@
<body>
<section name="Tomcat 5.5.20 (fhanik)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Fix logic error in UserDatbaseRealm.getprincipal() that caused user
+ roles assigned via groups to be ignored. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
<bug>31804</bug>: Unnested tags within a tag file are now configured
- with the Tag represented by the containing tag file as their parent
tag.
+ with the Tag represented by the containing tag file as their parent
+ tag. (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
