Commit 316b3355 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

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

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
parent b52b6af9

modules/aaa/mod_authz_core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ X- Remove the ap_requires field from authz_dir_conf 
X- Remove the function ap_requires() and authz_ap_requires()

X- Remove the function ap_requires() and authz_ap_requires()

   since their functionality is no longer supported 

   since their functionality is no longer supported 

   or necessary in the refactoring

   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

   core request handling to allow the hooks to be called

   in all cases.  Is this function even necessary

   in all cases.  Is this function even necessary

   anymore?

   anymore?

server/request.c

+13 −18
Original line number Original line Diff line number Diff line
@@ -190,7 +190,6 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) 
                return decl_die(access_status, "check access", 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)

            if (((access_status = ap_run_check_user_id(r)) != 0)

                || !ap_auth_type(r)) {

                || !ap_auth_type(r)) {

                return decl_die(access_status, ap_auth_type(r)

                return decl_die(access_status, ap_auth_type(r)
@@ -206,14 +205,10 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) 
                              : "perform authentication. AuthType not set!",

                              : "perform authentication. AuthType not set!",

                               r);

                               r);

            }

            }

            }

            break;

            break;





        case SATISFY_ANY:

        case SATISFY_ANY:

            if (((access_status = ap_run_access_checker(r)) != 0)) {

            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)

                if (((access_status = ap_run_check_user_id(r)) != 0)

                    || !ap_auth_type(r)) {

                    || !ap_auth_type(r)) {