Author: markt
Date: Sun Nov 17 22:06:02 2013
New Revision: 1542846
URL: http://svn.apache.org/r1542846
Log:
Fix typo in new attribute name
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:r1542845
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=1542846&r1=1542845&r2=1542846&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 Nov
17 22:06:02 2013
@@ -440,7 +440,7 @@ public class JNDIRealm extends RealmBase
* <code>javax.security.sasl.qop</code> environment property for the LDAP
* connection.
*/
- protected String spengoDelegationQop = "auth-conf";
+ protected String spnegoDelegationQop = "auth-conf";
// ------------------------------------------------------------- Properties
@@ -1004,12 +1004,12 @@ public class JNDIRealm extends RealmBase
}
- public String getSpengoDelegationQop() {
- return spengoDelegationQop;
+ public String getSpnegoDelegationQop() {
+ return spnegoDelegationQop;
}
- public void setSpengoDelegationQop(String spengoDelegationQop) {
- this.spengoDelegationQop = spengoDelegationQop;
+ public void setSpnegoDelegationQop(String spnegoDelegationQop) {
+ this.spnegoDelegationQop = spnegoDelegationQop;
}
@@ -2096,7 +2096,7 @@ public class JNDIRealm extends RealmBase
context.addToEnvironment(
"javax.security.sasl.server.authentication", "true");
context.addToEnvironment(
- "javax.security.sasl.qop", spengoDelegationQop);
+ "javax.security.sasl.qop", spnegoDelegationQop);
// Note: Subject already set in SPNEGO authenticator so no need
// for Subject.doAs() here
}
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=1542846&r1=1542845&r2=1542846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Sun Nov 17 22:06:02 2013
@@ -553,7 +553,7 @@
<code>0</code> is used which indicates no limit.</p>
</attribute>
- <attribute mame="spengoDelegationQop" requireed="false">
+ <attribute mame="spnegoDelegationQop" requireed="false">
<p>When the JNDI Realm is used with the SPNEGO authenticator and
<code>useDelegatedCredential</code> is <code>true</code> this attribute
controls the QOP that should be used for the connection to the LDAP
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
