[apparmor] [patch 11/11] mod_apparmor: include errno in log messages for failures

[John Johansen]

On 01/23/2014 02:45 AM, Steve Beattie wrote:
> 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 at nxnw.org>

Acked-by: John Johansen <john.johansen at canonical.com>

> ---
>  changehat/mod_apparmor/mod_apparmor.c |   11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> Index: b/changehat/mod_apparmor/mod_apparmor.c
> ===================================================================
> --- a/changehat/mod_apparmor/mod_apparmor.c
> +++ b/changehat/mod_apparmor/mod_apparmor.c
> @@ -78,7 +78,8 @@ immunix_init (apr_pool_t *p, apr_pool_t
>      	apr_file_read (file, (void *) &magic_token, &size);
>  	apr_file_close (file);
>      } 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");
>  
> @@ -97,8 +98,8 @@ immunix_child_init (apr_pool_t *p, serve
>  		    "init: calling change_hat with '%s'", DEFAULT_HAT);
>      ret = aa_change_hat(DEFAULT_HAT, magic_token);
>      if (ret < 0) {
> -        ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, "Failed to change_hat to '%s'",
> -			DEFAULT_HAT);
> +        ap_log_error(APLOG_MARK, APLOG_ERR, errno, ap_server_conf,
> +			"Failed to change_hat to '%s'", DEFAULT_HAT);
>      } else {
>          inside_default_hat = 1;
>      }
> @@ -238,8 +239,8 @@ immunix_exit_hat (request_rec *r)
>  
>      sd_ret = aa_change_hat(DEFAULT_HAT, magic_token);
>      if (sd_ret < 0) {
> -        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Failed to change_hat to '%s'",
> -			DEFAULT_HAT);
> +        ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
> +			"Failed to change_hat to '%s'", DEFAULT_HAT);
>      } else {
>          inside_default_hat = 1;
>      }
> 
> 
> -- AppArmor mailing list AppArmor at lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
>