You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2019/11/07 17:10:21 UTC
svn commit: r1869512 - /httpd/httpd/trunk/modules/aaa/mod_authz_core.c
Author: ylavic
Date: Thu Nov 7 17:10:21 2019
New Revision: 1869512
URL: http://svn.apache.org/viewvc?rev=1869512&view=rev
Log:
mod_authz_core: follow up to r1864759.
We should at least log the unexpected provider_name == NULL condition.
Modified:
httpd/httpd/trunk/modules/aaa/mod_authz_core.c
Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?rev=1869512&r1=1869511&r2=1869512&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Thu Nov 7 17:10:21 2019
@@ -193,7 +193,6 @@ static authz_status authz_alias_check_au
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_au
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_au
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 =