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

parser: convert commented out fprintf() in immunix.h to PDEBUG()

Browse Source
This commit is contained in:
Mike Salvatore
2020-09-05 09:38:53 -04:00
parent e2237057af
commit b947ad96f9
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parser/immunix.h
View File

@@ -145,18 +145,31 @@ enum pattern_t {
#define HAS_CHANGE_PROFILE(mode) ((mode) & AA_CHANGE_PROFILE) #define HAS_CHANGE_PROFILE(mode) ((mode) & AA_CHANGE_PROFILE)
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#ifdef DEBUG
#define PDEBUG(fmt, args...) \
do { \
int pdebug_error = errno; \
fprintf(stderr, "parser: " fmt, ## args); \
errno = pdebug_error; \
} while (0)
#else
#define PDEBUG(fmt, args...) /* Do nothing */
#endif
static inline int is_merged_x_consistent(int a, int b) static inline int is_merged_x_consistent(int a, int b)
{ {
if ((a & AA_USER_EXEC) && (b & AA_USER_EXEC) && if ((a & AA_USER_EXEC) && (b & AA_USER_EXEC) &&
((a & AA_USER_EXEC_TYPE) != (b & AA_USER_EXEC_TYPE))) ((a & AA_USER_EXEC_TYPE) != (b & AA_USER_EXEC_TYPE)))
{ {
//fprintf(stderr, "failed user merge 0x%x 0x%x\n", a, b); PDEBUG("failed user merge 0x%x 0x%x\n", a, b);
return 0; return 0;
} }
if ((a & AA_OTHER_EXEC) && (b & AA_OTHER_EXEC) && if ((a & AA_OTHER_EXEC) && (b & AA_OTHER_EXEC) &&
((a & AA_OTHER_EXEC_TYPE) != (b & AA_OTHER_EXEC_TYPE))) ((a & AA_OTHER_EXEC_TYPE) != (b & AA_OTHER_EXEC_TYPE)))
{ {
//fprintf(stderr, "failed other merge 0x%x 0x%x\n", a, b); PDEBUG("failed other merge 0x%x 0x%x\n", a, b);
return 0; return 0;
} }
return 1; return 1;