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

parser: Lift globals from create_cache()

Browse Source 
With create_cache() headed for libapparmor, we can't use the show_cache
or write_cache globals.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Tyler Hicks 2015-03-25 17:09:27 -05:00
parent ae231a8812
commit 9a073b8f87
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser/parser_main.c
View File

@ -930,6 +930,10 @@ int main(int argc, char *argv[])
} else if (!aa_policy_cache_is_valid(policy_cache)) {
if (write_cache && cond_clear_cache &&
aa_policy_cache_create(policy_cache)) {
if (show_cache)
PERROR("Cache write disabled: Cannot create cache '%s': %m\n",
cacheloc);
write_cache = 0;
skip_read_cache = 1;
} else if (!write_cache || !cond_clear_cache) {
if (show_cache)

20
parser/policy_cache.c
View File

@ -129,24 +129,16 @@ error:
if (stat(policy_cache->path, &stat_file) == -1) {
if (mkdir(policy_cache->path, 0700) == 0)
goto create_file;
if (show_cache)
PERROR("Can't create cache directory: %s\n",
policy_cache->path);
PERROR("Can't create cache directory: %s\n",
policy_cache->path);
} else if (!S_ISDIR(stat_file.st_mode)) {
if (show_cache)
PERROR("File in cache directory location: %s\n",
policy_cache->path);
PERROR("File in cache directory location: %s\n",
policy_cache->path);
} else {
if (show_cache)
PERROR("Can't update cache directory: %s\n",
policy_cache->path);
PERROR("Can't update cache directory: %s\n",
policy_cache->path);
}
if (show_cache)
PERROR("Cache write disabled: cannot create %s\n",
policy_cache->features_path);
write_cache = 0;
return -1;
}