Author: kkolinko
Date: Sun Nov 17 22:51:46 2013
New Revision: 1542857
URL: http://svn.apache.org/r1542857
Log:
Merged r1542856 from tomcat/trunk:
Fix a couple of typos and clarify what QOP stands for.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1542856
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=1542857&r1=1542856&r2=1542857&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:51:46 2013
@@ -553,15 +553,19 @@
<code>0</code> is used which indicates no limit.</p>
</attribute>
- <attribute mame="spnegoDelegationQop" requireed="false">
+ <attribute name="spnegoDelegationQop" required="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
+ controls the QOP (Quality of Protection) that should be used for
+ the connection to the LDAP
server after authentication. This value is used to set the
<code>javax.security.sasl.qop</code> environment property for the LDAP
connection. This attribute should be a comma-separated list of values
selected from <code>auth-conf</code>, <code>auth-int</code> and
- <code>auth</code>. The default value is <code>auth-conf</code>.</p>
+ <code>auth</code>. See <a
+
href="http://docs.oracle.com/javase/7/docs/api/javax/security/sasl/Sasl.html#QOP";
+ rel="nofollow">Java documentation</a> for more details.</p>
+ <p>The default value is <code>auth-conf</code>.</p>
</attribute>
<attribute name="stripRealmForGss" required="false">
@@ -580,7 +584,7 @@
<attribute name="useDelegatedCredential" required="false">
<p>When the JNDIRealm is used with the SPNEGO authenticator, delegated
credentials for the user may be available. If such credentials are
- present, this attribute controls whether are not they are used to
+ present, this attribute controls whether or not they are used to
connect to the directory. If not specified, the default value of
<code>true</code> is used.</p>
</attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
