mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 18:17:09 +00:00
Code Issues Releases Wiki Activity

mod_apparmor: include errno in log messages for failures

Browse Source 
This patch includes the errno in the log messages generated by two
different failed aa_change_hat() calls and the failure to open
/dev/urandom to get the random token, to further ease failure
diagnosis.

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 14:50:07 -08:00
parent 016e1f1b19
commit 52b3458972
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
changehat/mod_apparmor/mod_apparmor.c
View File

@ -78,7 +78,8 @@ immunix_init (apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
apr_file_read (file, (void *) &magic_token, &size); apr_file_read (file, (void *) &magic_token, &size);
apr_file_close (file); apr_file_close (file);
} else { } else {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, "Failed to open /dev/urandom"); ap_log_error(APLOG_MARK, APLOG_ERR, errno, ap_server_conf,
"Failed to open /dev/urandom");
} }
ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, ap_server_conf, "Opened /dev/urandom successfully"); ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, ap_server_conf, "Opened /dev/urandom successfully");
@ -97,8 +98,8 @@ immunix_child_init (apr_pool_t *p, server_rec *s)
"init: calling change_hat with '%s'", DEFAULT_HAT); "init: calling change_hat with '%s'", DEFAULT_HAT);
ret = aa_change_hat(DEFAULT_HAT, magic_token); ret = aa_change_hat(DEFAULT_HAT, magic_token);
if (ret < 0) { if (ret < 0) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, "Failed to change_hat to '%s'", ap_log_error(APLOG_MARK, APLOG_ERR, errno, ap_server_conf,
DEFAULT_HAT); "Failed to change_hat to '%s'", DEFAULT_HAT);
} else { } else {
inside_default_hat = 1; inside_default_hat = 1;
} }
@ -243,8 +244,8 @@ immunix_exit_hat (request_rec *r)
sd_ret = aa_change_hat(DEFAULT_HAT, magic_token); sd_ret = aa_change_hat(DEFAULT_HAT, magic_token);
if (sd_ret < 0) { if (sd_ret < 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Failed to change_hat to '%s'", ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
DEFAULT_HAT); "Failed to change_hat to '%s'", DEFAULT_HAT);
} else { } else {
inside_default_hat = 1; inside_default_hat = 1;
} }