[apparmor] [PATCH 02/31] fix cache write to not happen when skip-bad-cache is specified
Tyler Hicks
tyhicks at canonical.com
Sat Dec 6 00:22:01 UTC 2014
From: John Johansen <john.johansen at canonical.com>
Signed-off-by: John Johansen <john.johansen at canonical.com>
---
parser/parser_main.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/parser/parser_main.c b/parser/parser_main.c
index 58456e4..091eaa5 100644
--- a/parser/parser_main.c
+++ b/parser/parser_main.c
@@ -964,8 +964,14 @@ int process_profile(int option, const char *profilename)
stat_bin.st_size > 0) {
if (valid_cached_file_version(cachename))
set_mru_tstamp(stat_bin.st_ctim);
- } else if (debug_cache)
- pwarn("%s: Invalid or missing cache file '%s'\n", progname, cachename);
+ else if (!cond_clear_cache)
+ write_cache = 0;
+ } else {
+ if (!cond_clear_cache)
+ write_cache = 0;
+ if (debug_cache)
+ pwarn("%s: Invalid or missing cache file '%s' (%s)\n", progname, cachename, strerror(errno));
+ }
}
}
--
2.1.0
More information about the AppArmor
mailing list