Return-Path: 
 <dev-return-129540-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4D2FFDAE5
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Sun,  1 Jul 2012 20:31:26 +0000 (UTC)
Received: (qmail 15415 invoked by uid 500); 1 Jul 2012 20:31:25 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 15322 invoked by uid 500); 1 Jul 2012 20:31:25 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 15309 invoked by uid 99); 1 Jul 2012 20:31:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jul 2012 20:31:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jul 2012 20:31:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 043DF23888EA
	for <dev@tomcat.apache.org>; Sun,  1 Jul 2012 20:31:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1356007 - in /tomcat/trunk:
 java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/config/realm.xml
Date: Sun, 01 Jul 2012 20:31:01 -0000
To: dev@tomcat.apache.org
From: kkolinko@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120701203102.043DF23888EA@eris.apache.org>

Author: kkolinko
Date: Sun Jul  1 20:31:00 2012
New Revision: 1356007

URL: http://svn.apache.org/viewvc?rev=1356007&view=rev
Log:
Review of r1355615
Correct obvious typos
Remove trailing whitespace as reminded by checkstyle

Modified:
    tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
    tomcat/trunk/webapps/docs/config/realm.xml

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1356007&r1=1356006&r2=1356007&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Sun Jul  1 20:31:00 2012
@@ -1464,7 +1464,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/trunk/webapps/docs/config/realm.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1356007&r1=1356006&r2=1356007&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Sun Jul  1 20:31:00 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>
@@ -572,12 +572,12 @@
         not specified all the roles for a user derive from the role
         search.</p>
       </attribute>
-      
+
       <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