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

libapparmor: Fix build of features.c when debug is enabled

Browse Source 
PDEBUG is defined away when debug isn't configure in the build, this
hides the bad format string and argument.

Fix this and make sure we can still have the debug output that was
supposed to be printed.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/561
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Steve Beattie <sbeattie@ubuntu.com>
This commit is contained in:
John Johansen
2020-06-01 02:21:19 -07:00
parent 4c37806a11
commit 9623bcd575
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/libapparmor/src/features.c
View File

@@ -136,7 +136,7 @@ static ssize_t load_features_file(int file, char *buffer, size_t size)
if (len > 0)
errno = ENOBUFS;
PDEBUG("Error reading features file '%s': %m\n", path);
PDEBUG("Error reading features file: %m\n");
return -1;
}
@@ -162,6 +162,7 @@ static ssize_t open_and_load_features_file(int dirfd, const char *path,
char *buffer, size_t size)
{
autoclose int file = -1;
ssize_t rc;
file = openat(dirfd, path, O_RDONLY);
if (file < 0) {
@@ -175,7 +176,10 @@ static ssize_t open_and_load_features_file(int dirfd, const char *path,
return -1;
}
return load_features_file(file, buffer, size);
rc = load_features_file(file, buffer, size);
if (rc == -1)
PDEBUG("Error failed to load features file '%s': %m\n", path);
return rc;
}
static int features_dir_cb(int dirfd, const char *name, struct stat *st,