]> granicus.if.org Git - sudo/commitdiff
Fix setting of quiet flag when -q / --quiet is specified.
authorTodd C. Miller <Todd.Miller@courtesan.com>
Mon, 26 Aug 2013 20:40:25 +0000 (14:40 -0600)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Mon, 26 Aug 2013 20:40:25 +0000 (14:40 -0600)
Do not print "sudoers: parsed OK" in quiet mode.

plugins/sudoers/visudo.c

index e58fca0cd58354711ebb6b3e5da99e2825d8a524..2851ced1f0fb83c38c278bcb70d6614de1b59313 100644 (file)
@@ -207,7 +207,7 @@ main(int argc, char *argv[])
                strict = true;          /* strict mode */
                break;
            case 'q':
-               quiet = false;          /* quiet mode */
+               quiet = true;           /* quiet mode */
                break;
            default:
                usage(1);
@@ -852,15 +852,19 @@ check_syntax(char *sudoers_path, bool quiet, bool strict, bool oldperms)
        struct sudoersfile *sp;
 
        /* Parsed OK, check mode and owner. */
-       if (oldperms || check_owner(sudoers_path, quiet))
-           (void) printf(_("%s: parsed OK\n"), sudoers_path);
-       else
+       if (oldperms || check_owner(sudoers_path, quiet)) {
+           if (!quiet)
+               (void) printf(_("%s: parsed OK\n"), sudoers_path);
+       } else {
            ok = false;
+       }
        tq_foreach_fwd(&sudoerslist, sp) {
-           if (oldperms || check_owner(sp->path, quiet))
-               (void) printf(_("%s: parsed OK\n"), sp->path);
-           else
+           if (oldperms || check_owner(sp->path, quiet)) {
+               if (!quiet)
+                   (void) printf(_("%s: parsed OK\n"), sp->path);
+           } else {
                ok = false;
+           }
        }
     }