Remove the calls to ap_some_auth_required() from the request handling to allow the...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359172 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index 1f5441837df835b9759acda8cfd8aba1b708a58b..e0d3c8bcb5b3e4c887929a008e867d274d933ec2 100644 (file)
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -53,7 +53,7 @@ X- Remove the ap_requires field from authz_dir_conf
 X- Remove the function ap_requires() and authz_ap_requires()
    since their functionality is no longer supported 
    or necessary in the refactoring
-- Remove the calls to ap_some_auth_required() in the
+X- Remove the calls to ap_some_auth_required() in the
    core request handling to allow the hooks to be called
    in all cases.  Is this function even necessary
    anymore?

diff --git a/server/request.c b/server/request.c
index 7e196da815f6b8ecb2f327c61aaeec41166f8e8b..e62467a3580bf9a0f74b364a7bf6936ce3c333ae 100644 (file)
--- a/server/request.c
+++ b/server/request.c
@@ -190,30 +190,25 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
                 return decl_die(access_status, "check access", r);
             }
 
-            if (ap_some_auth_required(r)) {
-                if (((access_status = ap_run_check_user_id(r)) != 0)
-                    || !ap_auth_type(r)) {
-                    return decl_die(access_status, ap_auth_type(r)
-                                  ? "check user.  No user file?"
-                                  : "perform authentication. AuthType not set!",
-                                  r);
-                }
+            if (((access_status = ap_run_check_user_id(r)) != 0)
+                || !ap_auth_type(r)) {
+                return decl_die(access_status, ap_auth_type(r)
+                              ? "check user.  No user file?"
+                              : "perform authentication. AuthType not set!",
+                              r);
+            }
 
-                if (((access_status = ap_run_auth_checker(r)) != 0)
-                    || !ap_auth_type(r)) {
-                    return decl_die(access_status, ap_auth_type(r)
-                                  ? "check access.  No groups file?"
-                                  : "perform authentication. AuthType not set!",
-                                   r);
-                }
+            if (((access_status = ap_run_auth_checker(r)) != 0)
+                || !ap_auth_type(r)) {
+                return decl_die(access_status, ap_auth_type(r)
+                              ? "check access.  No groups file?"
+                              : "perform authentication. AuthType not set!",
+                               r);
             }
             break;
 
         case SATISFY_ANY:
             if (((access_status = ap_run_access_checker(r)) != 0)) {
-                if (!ap_some_auth_required(r)) {
-                    return decl_die(access_status, "check access", r);
-                }
 
                 if (((access_status = ap_run_check_user_id(r)) != 0)
                     || !ap_auth_type(r)) {