Author: schultz
Date: Thu Mar 8 19:26:59 2012
New Revision: 1298529
URL: http://svn.apache.org/viewvc?rev=1298529&view=rev
Log:
Fixed poor merge conflict resolution.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298529&r1=1298528&r2=1298529&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar
8 19:26:59 2012
@@ -146,7 +146,12 @@ public abstract class RealmBase extends
*/
protected boolean validate = true;
-
+ /**
+ * The name of the class to use for retrieving user names from X509
+ * certificates.
+ */
+ protected String x509UsernameRetrieverClassName;
+
/**
* The object that will extract user names from X509 client certificates.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
