From 96e63b4b08a6c9a49dff8d8976c1ad0dd7a25a0f Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 14 Feb 2012 17:11:07 -0500 Subject: [PATCH] --- yaml --- r: 292284 b: refs/heads/master c: b0d5de4d58803bbcce2b8175a8dd21c559a3abc1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/ima_audit.c | 2 +- trunk/security/integrity/ima/ima_policy.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8eb9b266e9c9..98f4fdb6034a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf06189e4d14641c0148bea16e9dd24943862215 +refs/heads/master: b0d5de4d58803bbcce2b8175a8dd21c559a3abc1 diff --git a/trunk/security/integrity/ima/ima_audit.c b/trunk/security/integrity/ima/ima_audit.c index 2ad942fb1e23..21e96bf188df 100644 --- a/trunk/security/integrity/ima/ima_audit.c +++ b/trunk/security/integrity/ima/ima_audit.c @@ -61,6 +61,6 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode, audit_log_untrustedstring(ab, inode->i_sb->s_id); audit_log_format(ab, " ino=%lu", inode->i_ino); } - audit_log_format(ab, " res=%d", !result ? 0 : 1); + audit_log_format(ab, " res=%d", !result); audit_log_end(ab); } diff --git a/trunk/security/integrity/ima/ima_policy.c b/trunk/security/integrity/ima/ima_policy.c index 0fb643a9c916..d8edff209bf3 100644 --- a/trunk/security/integrity/ima/ima_policy.c +++ b/trunk/security/integrity/ima/ima_policy.c @@ -418,7 +418,7 @@ static int ima_parse_rule(char *rule, struct ima_measure_rule_entry *entry) if (!result && (entry->action == UNKNOWN)) result = -EINVAL; - audit_log_format(ab, "res=%d", !!result); + audit_log_format(ab, "res=%d", !result); audit_log_end(ab); return result; }