--debug takes precedence over --quiet (#2743)

2 files changed, 6 insertions, 4 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index c0b2fca3c..089d80a68 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1256,8 +1256,10 @@ int main(int argc, char **argv, char **envp) {
         for (i = 1; i < argc; i++) {
                 run_cmd_and_exit(i, argc, argv); // will exit if the command is recognized
 
-                if (strcmp(argv[i], "--debug") == 0)
+                if (strcmp(argv[i], "--debug") == 0) {
                         arg_debug = 1;
+                        arg_quiet = 0;
+                }
                 else if (strcmp(argv[i], "--debug-blacklists") == 0)
                         arg_debug_blacklists = 1;
                 else if (strcmp(argv[i], "--debug-whitelists") == 0)
@@ -1265,8 +1267,8 @@ int main(int argc, char **argv, char **envp) {
                 else if (strcmp(argv[i], "--debug-private-lib") == 0)
                         arg_debug_private_lib = 1;
                 else if (strcmp(argv[i], "--quiet") == 0) {
-                        arg_quiet = 1;
-                        arg_debug = 0;
+                        if (!arg_debug)
+                                arg_quiet = 1;
                 }
                 else if (strcmp(argv[i], "--allow-debuggers") == 0) {
                         // already handled
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 38e94c074..af28cd488 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1734,7 +1734,7 @@ void profile_read(const char *fname) {
                 if (strcmp(ptr, "quiet") == 0) {
                         if (is_in_ignore_list(ptr))
                                 arg_quiet = 0;
-                        else
+                        else if (!arg_debug)
                                 arg_quiet = 1;
                         free(ptr);
                         continue;