Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1356020 - in /tomcat/tc7.0.x/trunk: ./
 java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/config/realm.xml
Date: Sun, 01 Jul 2012 20:49:27 -0000
To: dev@tomcat.apache.org
From: kkolinko@apache.org
Message-Id: <20120701204927.924062388962@eris.apache.org>

Author: kkolinko
Date: Sun Jul  1 20:49:26 2012
New Revision: 1356020

URL: http://svn.apache.org/viewvc?rev=1356020&view=rev
Log:
Review of r1355615 (r1355617)
Correct obvious typos
Remove trailing whitespace as reminded by checkstyle
It is merge of revision 1356007 from trunk.

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

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

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1356020&r1=1356019&r2=1356020&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Sun Jul  1 20:49:26 2012
@@ -1483,7 +1483,7 @@ public class JNDIRealm extends RealmBase
         if (userRoleName != null)
             roles = addAttributeValues(userRoleName, attrs, roles);
 
-        return new User(username, dn, password, roles, password);
+        return new User(username, dn, password, roles, userRoleAttrValue);
     }
 
 
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml?rev=1356020&r1=1356019&r2=1356020&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Sun Jul  1 20:49:26 2012
@@ -475,9 +475,9 @@
         <p>The LDAP filter expression used for performing role
         searches.  Use <code>{0}</code> to substitute the
         distinguished name (DN) of the user, and/or <code>{1}</code> to
-        substitute the username, and/or <code>{2}</code> the value of the 
-        userRoleAttribute attribute from the users directory entry. 
-        If not specified a role search does 
+        substitute the username, and/or <code>{2}</code> the value of the
+        userRoleAttribute attribute from the user's directory entry.
+        If not specified a role search does
         not take place and roles are taken only from the attribute in
         the user's entry specified by the <code>userRoleName</code>
         property.</p>
@@ -575,9 +575,9 @@
 
       <attribute name="userRoleAttribute" required="false">
         <p>The name of an attribute in the user's directory entry
-        containing the value that you wish to use when you search for 
-        roles. This is especially useful for RFC 2307 where 
-        the role memberUid can be the <code>uid</code> or the 
+        containing the value that you wish to use when you search for
+        roles. This is especially useful for RFC 2307 where
+        the role memberUid can be the <code>uid</code> or the
         <code>uidNumber</code> of the user. This value will be
         marked as <code>{2}</code> in your role pattern.
         This value will NOT be available for nested group searches,


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