diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2005-12-27 04:44:18 +0000 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2005-12-27 04:44:18 +0000 |
| commit | 12315b2fcebba707c134162edd88d43361eef708 (patch) | |
| tree | 5ee7e4f77f33d06ec7f024258fd3e862f81366cf | |
| parent | 82bac337613689d043e85f4863c0f1bb7e03d612 (diff) | |
| download | httpd-12315b2fcebba707c134162edd88d43361eef708.tar.gz | |
Remove the calls to ap_some_auth_required() from the request handling to allow the authn and authz hooks to be called without restriction
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359172 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/aaa/mod_authz_core.c | 2 | ||||
| -rw-r--r-- | server/request.c | 31 |
2 files changed, 14 insertions, 19 deletions
diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c index 1f5441837d..e0d3c8bcb5 100644 --- 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 7e196da815..e62467a358 100644 --- 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)) { |