You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2005/12/10 02:29:05 UTC
svn commit: r355681 -
/httpd/httpd/branches/authz-dev/modules/aaa/mod_authz_core.c
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);
}