diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/main.c | 10 | ||||
-rw-r--r-- | src/firejail/seccomp.c | 4 | ||||
-rw-r--r-- | src/fsec-print/main.c | 8 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 922ba2edb..d550e8df9 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -966,8 +966,15 @@ static void run_builder(int argc, char **argv) { | |||
966 | exit(1); | 966 | exit(1); |
967 | } | 967 | } |
968 | 968 | ||
969 | void filter_add_errno(int fd, int syscall, int arg, void *ptrarg, bool native) {} | 969 | void filter_add_errno(int fd, int syscall, int arg, void *ptrarg, bool native) { |
970 | (void) fd; | ||
971 | (void) syscall; | ||
972 | (void) arg; | ||
973 | (void) ptrarg; | ||
974 | (void) native; | ||
975 | } | ||
970 | 976 | ||
977 | #ifdef HAVE_SECCOMP | ||
971 | static int check_postexec(const char *list) { | 978 | static int check_postexec(const char *list) { |
972 | char *prelist, *postlist; | 979 | char *prelist, *postlist; |
973 | 980 | ||
@@ -978,6 +985,7 @@ static int check_postexec(const char *list) { | |||
978 | } | 985 | } |
979 | return 0; | 986 | return 0; |
980 | } | 987 | } |
988 | #endif | ||
981 | 989 | ||
982 | //******************************************* | 990 | //******************************************* |
983 | // Main program | 991 | // Main program |
diff --git a/src/firejail/seccomp.c b/src/firejail/seccomp.c index b0a48591e..612ece85d 100644 --- a/src/firejail/seccomp.c +++ b/src/firejail/seccomp.c | |||
@@ -324,14 +324,12 @@ int seccomp_filter_keep(bool native) { | |||
324 | if (arg_debug) | 324 | if (arg_debug) |
325 | printf("Build keep seccomp filter\n"); | 325 | printf("Build keep seccomp filter\n"); |
326 | 326 | ||
327 | const char *command, *filter, *postexec_filter, *list; | 327 | const char *filter, *postexec_filter, *list; |
328 | if (native) { | 328 | if (native) { |
329 | command = "keep"; | ||
330 | filter = RUN_SECCOMP_CFG; | 329 | filter = RUN_SECCOMP_CFG; |
331 | postexec_filter = RUN_SECCOMP_POSTEXEC; | 330 | postexec_filter = RUN_SECCOMP_POSTEXEC; |
332 | list = cfg.seccomp_list_keep; | 331 | list = cfg.seccomp_list_keep; |
333 | } else { | 332 | } else { |
334 | command = "keep32"; | ||
335 | filter = RUN_SECCOMP_32; | 333 | filter = RUN_SECCOMP_32; |
336 | postexec_filter = RUN_SECCOMP_POSTEXEC_32; | 334 | postexec_filter = RUN_SECCOMP_POSTEXEC_32; |
337 | list = cfg.seccomp_list_keep32; | 335 | list = cfg.seccomp_list_keep32; |
diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c index 7bb4fd0cd..8b7c68434 100644 --- a/src/fsec-print/main.c +++ b/src/fsec-print/main.c | |||
@@ -25,7 +25,13 @@ static void usage(void) { | |||
25 | } | 25 | } |
26 | 26 | ||
27 | int arg_quiet = 0; | 27 | int arg_quiet = 0; |
28 | void filter_add_errno(int fd, int syscall, int arg, void *ptrarg, bool native) {} | 28 | void filter_add_errno(int fd, int syscall, int arg, void *ptrarg, bool native) { |
29 | (void) fd; | ||
30 | (void) syscall; | ||
31 | (void) arg; | ||
32 | (void) ptrarg; | ||
33 | (void) native; | ||
34 | } | ||
29 | 35 | ||
30 | int main(int argc, char **argv) { | 36 | int main(int argc, char **argv) { |
31 | #if 0 | 37 | #if 0 |