mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 15:55:46 +00:00
Code Issues Releases Wiki Activity

parser: Don't use the basedir global in setup_cache()

Browse Source 
Require the caller of setup_cache() to pass in a valid cache location
string. This removes the use of the basedir global from the
policy_cache.c file.

Additionally, it is no longer necessary to return the "cache dir" path
from setup_cache() since it will always be the same as the input path.
The return value is changed to an int so an error code can be returned
instead of using exit().

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:26 -05:00
parent d02bb58b70
commit d2e3f806c0
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parser/parser_main.c
View File

@@ -877,7 +877,6 @@ static void setup_flags(void)
int main(int argc, char *argv[])
{
autofree char *cachedir = NULL;
int retval, last_error;
int i;
int optind;
@@ -910,7 +909,17 @@ int main(int argc, char *argv[])
setup_flags();
cachedir = setup_cache(cacheloc);
if (!cacheloc && asprintf(&cacheloc, "%s/cache", basedir) == -1) {
PERROR(_("Memory allocation error."));
return 1;
}
retval = setup_cache(cacheloc);
if (retval) {
PERROR(_("Failed setting up policy cache (%s): %s\n"),
cacheloc, strerror(errno));
return 1;
}
retval = last_error = 0;
for (i = optind; i <= argc; i++) {
@@ -938,7 +947,7 @@ int main(int argc, char *argv[])
struct dir_cb_data cb_data;
cb_data.dirname = profilename;
cb_data.cachedir = cachedir;
cb_data.cachedir = cacheloc;
cb = binary_input ? binary_dir_cb : profile_dir_cb;
if ((retval = dirat_for_each(NULL, profilename,
&cb_data, cb))) {
@@ -948,7 +957,7 @@ int main(int argc, char *argv[])
} else if (binary_input) {
retval = process_binary(option, profilename);
} else {
retval = process_profile(option, profilename, cachedir);
retval = process_profile(option, profilename, cacheloc);
}
if (profilename) free(profilename);