diff options
| author | Yann Ylavic <ylavic@apache.org> | 2019-11-07 18:10:21 +0100 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2019-11-07 18:10:21 +0100 |
| commit | dd41900fb6405e43af72c4956b45a6911022ae8c (patch) | |
| tree | 67b6b59c54655cc82b9eb7c4508ca4ca2625af91 /modules/aaa | |
| parent | Never checkin generated files applied to build/apr_common.m4. (diff) | |
| download | apache2-dd41900fb6405e43af72c4956b45a6911022ae8c.tar.xz apache2-dd41900fb6405e43af72c4956b45a6911022ae8c.zip | |
mod_authz_core: follow up to r1864759.
We should at least log the unexpected provider_name == NULL condition.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869512 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/aaa')
| -rw-r--r-- | modules/aaa/mod_authz_core.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c index 9c12003018..40e5fe1414 100644 --- a/modules/aaa/mod_authz_core.c +++ b/modules/aaa/mod_authz_core.c @@ -193,7 +193,6 @@ static authz_status authz_alias_check_authorization(request_rec *r, const void *parsed_require_args) { const char *provider_name; - authz_status ret = AUTHZ_DENIED; /* Look up the provider alias in the alias list. * Get the dir_config and call ap_merge_per_dir_configs() @@ -217,6 +216,7 @@ static authz_status authz_alias_check_authorization(request_rec *r, configurations and call the real provider */ if (prvdraliasrec) { ap_conf_vector_t *orig_dir_config = r->per_dir_config; + authz_status ret; r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config, @@ -227,15 +227,16 @@ static authz_status authz_alias_check_authorization(request_rec *r, prvdraliasrec->provider_parsed_args); r->per_dir_config = orig_dir_config; - } - else { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02305) - "no alias provider found for '%s' (BUG?)", - provider_name); + + return ret; } } - return ret; + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02305) + "no alias provider found for '%s' (BUG?)", + provider_name ? provider_name : "n/a"); + + return AUTHZ_DENIED; } static const authz_provider authz_alias_provider = |