mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

Effectively revert revno 1471, and fix the misdetected error condition

Browse Source 
so that caching will work again without needing kernel_load.
This commit is contained in:
Kees Cook
2010-09-14 12:38:38 -07:00
parent 3a1fbb49f4
commit feb70284bc
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parser/parser_interface.c
View File

@@ -550,7 +550,6 @@ int count_tailglob_ents(struct cod_entry *list)
int sd_serialize_profile(sd_serialize *p, struct codomain *profile,
int flattened)
{
struct cod_entry *entry;
uint64_t allowed_caps;
if (!sd_write_struct(p, "profile"))
@@ -749,13 +748,9 @@ int sd_serialize_codomain(int option, struct codomain *cod)
break;
}
if (fd < 0) {
if (kernel_load)
PERROR(_("Unable to open %s - %s\n"), filename,
strerror(errno));
else
PERROR(_("Unable to open output file - %s\n"),
strerror(errno));
if (fd < 0 && (kernel_load || option == OPTION_OFILE || option == OPTION_STDOUT)) {
PERROR(_("Unable to open %s - %s\n"), filename,
strerror(errno));
error = -errno;
goto exit;
}