Author: remm
Date: Thu Feb 15 16:05:48 2018
New Revision: 1824323
URL: http://svn.apache.org/viewvc?rev=1824323&view=rev
Log:
62104: Fix programmatic login regression as the NonLoginAuthenticator has to be
set for it to work (if no login method is specified).
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1824323&r1=1824322&r2=1824323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Feb 15
16:05:48 2018
@@ -342,19 +342,11 @@ public class ContextConfig implements Li
protected void authenticatorConfig() {
LoginConfig loginConfig = context.getLoginConfig();
-
- SecurityConstraint constraints[] = context.findConstraints();
- if ((constraints == null || constraints.length ==0) &&
- !context.getPreemptiveAuthentication()) {
- // No need for an authenticator
- return;
- } else {
- if (loginConfig == null) {
- // Security constraints present. Need an authenticator to
- // support them.
- loginConfig = DUMMY_LOGIN_CONFIG;
- context.setLoginConfig(loginConfig);
- }
+ if (loginConfig == null) {
+ // Security constraints present. Need an authenticator to
+ // support them.
+ loginConfig = DUMMY_LOGIN_CONFIG;
+ context.setLoginConfig(loginConfig);
}
// Has an authenticator been configured already?
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1824323&r1=1824322&r2=1824323&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Feb 15 16:05:48 2018
@@ -65,6 +65,11 @@
compressed with brotli compression. Based on a patch provided by burka.
(markt)
</fix>
+ <fix>
+ <bug>62104</bug>: Fix programmatic login regression as the
+ NonLoginAuthenticator has to be set for it to work (if no login method
+ is specified). (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
