nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make --hash-password imply --hush to prevent unnecessary noise.

Browse Source
This commit is contained in:
cypherpunks 2015-04-10 16:10:44 +02:00 committed by Nick Mathewson
parent e891deb021
commit 59e753a4a6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket15542 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (command-line interface):
- Make --hash-password imply --hush to prevent unnecessary noise. Closes
ticket 15542.

3
src/or/main.c
View File

@ -2484,10 +2484,11 @@ tor_init(int argc, char *argv[])
if (!strcmp(cl->key, "--quiet") || if (!strcmp(cl->key, "--quiet") ||
!strcmp(cl->key, "--dump-config")) !strcmp(cl->key, "--dump-config"))
quiet = 2; quiet = 2;
/* --version, --digests, and --help imply --hush */ /* The following options imply --hush */
if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") || if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") ||
!strcmp(cl->key, "--list-torrc-options") || !strcmp(cl->key, "--list-torrc-options") ||
!strcmp(cl->key, "--library-versions") || !strcmp(cl->key, "--library-versions") ||
!strcmp(cl->key, "--hash-password") ||
!strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) { !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) {
if (quiet < 1) if (quiet < 1)
quiet = 1; quiet = 1;