Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Message-ID: <20051227044423.44552.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r359172 - in /httpd/httpd/branches/authz-dev:
 modules/aaa/mod_authz_core.c server/request.c
Date: Tue, 27 Dec 2005 04:44:22 -0000
To: cvs@httpd.apache.org
From: bnicholes@apache.org

Author: bnicholes
Date: Mon Dec 26 20:44:18 2005
New Revision: 359172

URL: http://svn.apache.org/viewcvs?rev=359172&view=rev
Log:
Remove the calls to ap_some_auth_required() from the request handling to allow the authn and authz hooks to be called without restriction

Modified:
    httpd/httpd/branches/authz-dev/modules/aaa/mod_authz_core.c
    httpd/httpd/branches/authz-dev/server/request.c

Modified: httpd/httpd/branches/authz-dev/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/modules/aaa/mod_authz_core.c?rev=359172&r1=359171&r2=359172&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/branches/authz-dev/modules/aaa/mod_authz_core.c Mon Dec 26 20:44:18 2005
@@ -53,7 +53,7 @@
 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?

Modified: httpd/httpd/branches/authz-dev/server/request.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/server/request.c?rev=359172&r1=359171&r2=359172&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/server/request.c (original)
+++ httpd/httpd/branches/authz-dev/server/request.c Mon Dec 26 20:44:18 2005
@@ -190,30 +190,25 @@
                 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)) {