From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 7 Apr 2014 09:10:51 +0000 (+0000)
Subject: mod_auth_form: revert r1585431 (don't crash when no AuthFormProvider is configured).
X-Git-Tag: 2.5.0-alpha~4340
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42e7a43e3c9679bc1c10e3823a09de282f2883f1;p=apache

mod_auth_form: revert r1585431 (don't crash when no AuthFormProvider is configured).
This cannot happen in trunk, 2.4.x needs authenticate_form_post_config() to be
merged (r1531672).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1585434 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index d9e63ef1b8..c7726ec82a 100644
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-2620
+2615
diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c
index ef1bfd2e96..e72857a6a7 100644
--- a/modules/aaa/mod_auth_form.c
+++ b/modules/aaa/mod_auth_form.c
@@ -909,14 +909,6 @@ static int authenticate_form_authn(request_rec * r)
         return HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    /* We need an authentication provider. */
-    if (!conf->providers) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR,
-                      0, r, APLOGNO(02617) "need AuthFormProvider: %s",
-                      r->uri);
-        return HTTP_INTERNAL_SERVER_ERROR;
-    }
-
     /* We need an authentication realm. */
     if (!ap_auth_name(r)) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR,
@@ -1290,7 +1282,7 @@ static int authenticate_form_post_config(apr_pool_t *pconf, apr_pool_t *plog,
         ap_session_get_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_get);
         ap_session_set_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_set);
         if (!ap_session_load_fn || !ap_session_get_fn || !ap_session_set_fn) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO(02618)
+            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO()
                     "You must load mod_session to enable the mod_auth_form "
                                        "functions");
             return !OK;
@@ -1301,7 +1293,7 @@ static int authenticate_form_post_config(apr_pool_t *pconf, apr_pool_t *plog,
         ap_request_insert_filter_fn = APR_RETRIEVE_OPTIONAL_FN(ap_request_insert_filter);
         ap_request_remove_filter_fn = APR_RETRIEVE_OPTIONAL_FN(ap_request_remove_filter);
         if (!ap_request_insert_filter_fn || !ap_request_remove_filter_fn) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO(02619)
+            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO()
                     "You must load mod_request to enable the mod_auth_form "
                                        "functions");
             return !OK;