www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity

localize some variables in authz provider alias functions

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709736 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Darroch
2008-11-01 17:58:19 +00:00
parent 8564ca3ee9
commit a7e48ffbbb
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/aaa/mod_authz_core.c
View File

@@ -172,9 +172,6 @@ static authz_status authz_alias_check_authorization(request_rec *r,
{ {
const char *provider_name = apr_table_get(r->notes, AUTHZ_PROVIDER_NAME_NOTE); const char *provider_name = apr_table_get(r->notes, AUTHZ_PROVIDER_NAME_NOTE);
authz_status ret = AUTHZ_DENIED; authz_status ret = AUTHZ_DENIED;
authz_core_srv_conf *authcfg =
(authz_core_srv_conf *)ap_get_module_config(r->server->module_config,
&authz_core_module);
/* Look up the provider alias in the alias list. /* Look up the provider alias in the alias list.
* Get the the dir_config and call ap_Merge_per_dir_configs() * Get the the dir_config and call ap_Merge_per_dir_configs()
@@ -183,14 +180,20 @@ static authz_status authz_alias_check_authorization(request_rec *r,
*/ */
if (provider_name) { if (provider_name) {
provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec, authz_core_srv_conf *authcfg;
provider_name, provider_alias_rec *prvdraliasrec;
APR_HASH_KEY_STRING);
ap_conf_vector_t *orig_dir_config = r->per_dir_config; authcfg = ap_get_module_config(r->server->module_config,
&authz_core_module);
prvdraliasrec = apr_hash_get(authcfg->alias_rec, provider_name,
APR_HASH_KEY_STRING);
/* If we found the alias provider in the list, then merge the directory /* If we found the alias provider in the list, then merge the directory
configurations and call the real provider */ configurations and call the real provider */
if (prvdraliasrec) { if (prvdraliasrec) {
ap_conf_vector_t *orig_dir_config = r->per_dir_config;
r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config, r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config,
prvdraliasrec->sec_auth); prvdraliasrec->sec_auth);
ret = prvdraliasrec->provider->check_authorization(r, ret = prvdraliasrec->provider->check_authorization(r,
@@ -218,9 +221,6 @@ static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig,
char *provider_args; char *provider_args;
const char *errmsg; const char *errmsg;
ap_conf_vector_t *new_authz_config = ap_create_per_dir_config(cmd->pool); ap_conf_vector_t *new_authz_config = ap_create_per_dir_config(cmd->pool);
authz_core_srv_conf *authcfg =
(authz_core_srv_conf *)ap_get_module_config(cmd->server->module_config,
&authz_core_module);
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) { if (err != NULL) {
@@ -258,9 +258,7 @@ static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig,
if (!errmsg) { if (!errmsg) {
provider_alias_rec *prvdraliasrec = apr_pcalloc(cmd->pool, provider_alias_rec *prvdraliasrec = apr_pcalloc(cmd->pool,
sizeof(provider_alias_rec)); sizeof(provider_alias_rec));
const authz_provider *provider = authz_core_srv_conf *authcfg;
ap_lookup_provider(AUTHZ_PROVIDER_GROUP, provider_name,
AUTHZ_PROVIDER_VERSION);
/* Save off the new directory config along with the original /* Save off the new directory config along with the original
* provider name and function pointer data * provider name and function pointer data
@@ -269,7 +267,13 @@ static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig,
prvdraliasrec->provider_name = provider_name; prvdraliasrec->provider_name = provider_name;
prvdraliasrec->provider_alias = provider_alias; prvdraliasrec->provider_alias = provider_alias;
prvdraliasrec->provider_args = provider_args; prvdraliasrec->provider_args = provider_args;
prvdraliasrec->provider = provider; prvdraliasrec->provider =
ap_lookup_provider(AUTHZ_PROVIDER_GROUP, provider_name,
AUTHZ_PROVIDER_VERSION);
authcfg = ap_get_module_config(cmd->server->module_config,
&authz_core_module);
apr_hash_set(authcfg->alias_rec, provider_alias, apr_hash_set(authcfg->alias_rec, provider_alias,
APR_HASH_KEY_STRING, prvdraliasrec); APR_HASH_KEY_STRING, prvdraliasrec);