Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 94327 invoked from network); 10 Dec 2005 01:29:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Dec 2005 01:29:33 -0000 Received: (qmail 87420 invoked by uid 500); 10 Dec 2005 01:29:27 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 87308 invoked by uid 500); 10 Dec 2005 01:29:27 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 87254 invoked by uid 99); 10 Dec 2005 01:29:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2005 17:29:27 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 09 Dec 2005 17:29:26 -0800 Received: (qmail 94160 invoked by uid 65534); 10 Dec 2005 01:29:06 -0000 Message-ID: <20051210012906.94159.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r355681 - /httpd/httpd/branches/authz-dev/modules/aaa/mod_authz_core.c Date: Sat, 10 Dec 2005 01:29:05 -0000 To: cvs@httpd.apache.org From: bnicholes@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bnicholes Date: Fri Dec 9 17:29:03 2005 New Revision: 355681 URL: http://svn.apache.org/viewcvs?rev=355681&view=rev Log: Remove the ap_requires API since it no longer fits with the new provider based authorization architecture Modified: httpd/httpd/branches/authz-dev/modules/aaa/mod_authz_core.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=355681&r1=355680&r2=355681&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 Fri Dec 9 17:29:03 2005 @@ -79,7 +79,6 @@ */ typedef struct { - apr_array_header_t *ap_requires; authz_provider_list *providers; } authz_core_dir_conf; @@ -93,6 +92,7 @@ return (void *)conf; } +#if 0 static void *merge_authz_core_dir_config(apr_pool_t *a, void *basev, void *newv) { authz_core_dir_conf *base = (authz_core_dir_conf *)basev; @@ -105,12 +105,9 @@ conf = (authz_core_dir_conf *)apr_palloc(a, sizeof(authz_core_dir_conf)); memcpy(conf, base, sizeof(authz_core_dir_conf)); - if (new->ap_requires) { - conf->ap_requires = new->ap_requires; - } - return (void*)conf; } +#endif static const char *add_authz_provider(cmd_parms *cmd, void *config, const char *arg) @@ -267,16 +264,6 @@ return OK; } -static const apr_array_header_t *authz_ap_requires(request_rec *r) -{ - authz_core_dir_conf *conf; - - conf = (authz_core_dir_conf *)ap_get_module_config(r->per_dir_config, - &authz_core_module); - - return conf->ap_requires; -} - static int authz_some_auth_required(request_rec *r) { authz_core_dir_conf *conf = ap_get_module_config(r->per_dir_config, @@ -302,9 +289,8 @@ static void register_hooks(apr_pool_t *p) { - APR_REGISTER_OPTIONAL_FN(authz_ap_requires); APR_REGISTER_OPTIONAL_FN(authz_some_auth_required); - + ap_hook_auth_checker(authorize_user, NULL, NULL, APR_HOOK_MIDDLE); }