From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 30 Jan 2010 23:08:46 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c54fe858caefdc62bed2213790ebe195c69dee79;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
Get nested role search working when {1} is used in roleSearch
Patch provided by Gabriel

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@904914 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java
index 72a07171c..0392c56f5 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1686,7 +1686,7 @@ public class JNDIRealm extends RealmBase {
                 Set<String> newThisRound = new HashSet<String>(); // Stores the groups we find in this iteration
 
                 for (String groupDN : newGroupDNs) {
-                    filter = roleFormat.format(new String[] { groupDN });
+                    filter = roleFormat.format(new String[] { groupDN, groupDN });
 
                     if (containerLog.isTraceEnabled()) {
                         containerLog.trace("Perform a nested group search with base "+ roleBase + " and filter " + filter);