summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-14 12:12:53 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-14 12:12:53 -0400
commitf70f1d283e4fb46882f9a72810af09c11cd626b4 (patch)
treea077aa4660e10aa9ada6d926cf7befbb37927dc8 /src/or
parent3a68f2f54ed67176a8ed0b7aa276ef58a54b26db (diff)
downloadtor-f70f1d283e4fb46882f9a72810af09c11cd626b4.tar.gz
tor-f70f1d283e4fb46882f9a72810af09c11cd626b4.zip
Do not printf success messages when we are --quieted or --hushed.
Fixes 14994. Calling this a bug on when --quiet and --hush began to have their current behavior.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index bc89458e87..49c1b667ac 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2783,8 +2783,8 @@ do_dump_config(void)
} else if (!strcmp(arg, "full")) {
how = OPTIONS_DUMP_ALL;
} else {
- printf("%s is not a recognized argument to --dump-config. "
- "Please select 'short', 'non-builtin', or 'full'", arg);
+ fprintf(stderr, "%s is not a recognized argument to --dump-config. "
+ "Please select 'short', 'non-builtin', or 'full'", arg);
return -1;
}
@@ -3085,7 +3085,8 @@ tor_main(int argc, char *argv[])
result = 0;
break;
case CMD_VERIFY_CONFIG:
- printf("Configuration was valid\n");
+ if (get_options()->quiet_level)
+ printf("Configuration was valid\n");
result = 0;
break;
case CMD_DUMP_CONFIG: