funkman 2004/02/05 17:49:48
Modified: catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Bugzilla 26487
RFC 2254 done on whole string instead of just DN
Patch submitted by Jeff Tulley - jtulley A T novell.com
Revision Changes Path
1.17 +5 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JNDIRealm.java 12 Dec 2003 21:31:56 -0000 1.16
+++ JNDIRealm.java 6 Feb 2004 01:49:48 -0000 1.17
@@ -1340,8 +1340,7 @@
return (list);
// Set up parameters for an appropriate search
- String filter = roleFormat.format(new String[] { dn, username });
- filter = doRFC2254Encoding(filter);
+ String filter = roleFormat.format(new String[] { doRFC2254Encoding(dn),
username });
SearchControls controls = new SearchControls();
if (roleSubtree)
controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]