mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Subject: mod_apparmor: convert debug_dump_uri to use trace loglevel

Browse source 
This patch converts the debug_dump_uri() function to use the trace
loglevels and enable it all the time, rather than just when DEBUG is
defined at compile time.

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Steve Beattie 2014-01-23 13:41:57 -08:00
parent 087ec5e1ce
commit eff2a32082
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
changehat/mod_apparmor/mod_apparmor.c
View file

@ -104,24 +104,20 @@ immunix_child_init (apr_pool_t *p, server_rec *s)
} }
} }
#ifdef DEBUG
static void static void
debug_dump_uri (apr_uri_t * uri) debug_dump_uri(request_rec *r)
{ {
if (uri) apr_uri_t *uri = &r->parsed_uri;
ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "Dumping uri info " if (uri)
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "Dumping uri info "
"scheme='%s' host='%s' path='%s' query='%s' fragment='%s'", "scheme='%s' host='%s' path='%s' query='%s' fragment='%s'",
uri->scheme, uri->hostname, uri->path, uri->query, uri->scheme, uri->hostname, uri->path, uri->query,
uri->fragment); uri->fragment);
else else
ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "Asked to dump NULL uri"); ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "Asked to dump NULL uri");
} }
#else
static void
debug_dump_uri (apr_uri_t * __unused uri) { }
#endif
/* /*
immunix_enter_hat will attempt to change_hat in the following order: immunix_enter_hat will attempt to change_hat in the following order:
(1) to a hatname in a location directive (1) to a hatname in a location directive
@ -139,7 +135,7 @@ immunix_enter_hat (request_rec *r)
immunix_srv_cfg * scfg = (immunix_srv_cfg *) immunix_srv_cfg * scfg = (immunix_srv_cfg *)
ap_get_module_config (r->server->module_config, &apparmor_module); ap_get_module_config (r->server->module_config, &apparmor_module);
debug_dump_uri (&r->parsed_uri); debug_dump_uri(r);
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "in immunix_enter_hat (%s) n:0x%lx p:0x%lx main:0x%lx", ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "in immunix_enter_hat (%s) n:0x%lx p:0x%lx main:0x%lx",
dcfg->path, (unsigned long) r->next, (unsigned long) r->prev, dcfg->path, (unsigned long) r->next, (unsigned long) r->prev,
(unsigned long) r->main); (unsigned long) r->main);