markt 2004/10/10 13:42:32
Modified: catalina/src/share/org/apache/catalina/realm Tag: TOMCAT_5_0
JNDIRealm.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
webapps/docs/config Tag: TOMCAT_5_0 realm.xml
Log:
Fix bug 31273. Add support for derefAliases.
- Ported from TC4
Revision Changes Path
No revision
No revision
1.12.2.1 +29 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- JNDIRealm.java 26 May 2004 15:51:14 -0000 1.12
+++ JNDIRealm.java 10 Oct 2004 20:42:32 -0000 1.12.2.1
@@ -193,6 +193,17 @@
*/
protected String contextFactory = "com.sun.jndi.ldap.LdapCtxFactory";
+
+ /**
+ * How aliases should be dereferenced during search operations.
+ */
+ protected String derefAliases = null;
+
+ /**
+ * Constant that holds the name of the environment property for specifying
+ * the manner in which aliases should be dereferenced.
+ */
+ public final static String DEREF_ALIASES = "java.naming.ldap.derefAliases";
/**
* Descriptive information about this Realm implementation.
@@ -443,6 +454,21 @@
}
+ /**
+ * Return the derefAliases setting to be used.
+ */
+ public java.lang.String getDerefAliases() {
+ return derefAliases;
+ }
+
+ /**
+ * Set the value for derefAliases to be used when searching the directory.
+ *
+ * @param derefAliases New value of property derefAliases.
+ */
+ public void setDerefAliases(java.lang.String derefAliases) {
+ this.derefAliases = derefAliases;
+ }
/**
* Return the protocol to be used.
@@ -1524,6 +1550,8 @@
env.put(Context.SECURITY_PROTOCOL, protocol);
if (referrals != null)
env.put(Context.REFERRAL, referrals);
+ if (derefAliases != null)
+ env.put(JNDIRealm.DEREF_ALIASES, derefAliases);
return env;
No revision
No revision
1.70.2.51 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.50
retrieving revision 1.70.2.51
diff -u -r1.70.2.50 -r1.70.2.51
--- changelog.xml 6 Oct 2004 13:35:51 -0000 1.70.2.50
+++ changelog.xml 10 Oct 2004 20:42:32 -0000 1.70.2.51
@@ -22,6 +22,9 @@
<subsection name="Catalina">
<changelog>
+ <fix>
+ <bug>31273</bug>: Add support for derefaliases in JNDIRealm. (markt)
+ </fix>
</changelog>
</subsection>
No revision
No revision
1.5.2.1 +6 -0 jakarta-tomcat-catalina/webapps/docs/config/realm.xml
Index: realm.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/realm.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- realm.xml 15 Jan 2003 03:40:44 -0000 1.5
+++ realm.xml 10 Oct 2004 20:42:32 -0000 1.5.2.1
@@ -300,6 +300,12 @@
assumes that the standard JNDI LDAP provider will be utilized.</p>
</attribute>
+ <attribute name="derefAliases" required="false">
+ <p>A string specifying how aliases are to be dereferenced during
+ search operations. The allowed values are "always", "never",
+ "finding" and "searching". If not specified, "always" is used.</p>
+ </attribute>
+
<attribute name="protocol" required="false">
<p>A string specifying the security protocol to use. If not given
the providers default is used.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
