Browse Source

Disallow --hash-password with no commandline arguments.

Fixes bug 9573.

Bugfix on 59453ac6e in 0.0.9pre5, which fixed a crash in a silly way.
Nick Mathewson 12 years ago
parent
commit
75d795b1d7
3 changed files with 4 additions and 4 deletions
  1. 2 2
      changes/bug4647
  2. 1 1
      doc/tor.1.txt
  3. 1 1
      src/or/config.c

+ 2 - 2
changes/bug4647

@@ -6,6 +6,6 @@
       names as command-line options. Fixes bugs 4647 and 9578; bugfix on
       0.0.9pre5.
 
-
-
+    - No longer allow 'tor --hash-password' with no arguments. Fixes bug
+      9573; bugfix on 0.0.9pre5.
 

+ 1 - 1
doc/tor.1.txt

@@ -46,7 +46,7 @@ COMMAND-LINE OPTIONS
     configuration file, and by those on the command line. (Default:
     @CONFDIR@/torrc-defaults.)
 
-**--hash-password**::
+**--hash-password** __PASSWORD__::
     Generates a hashed password for control port access.
 
 **--list-fingerprint**::

+ 1 - 1
src/or/config.c

@@ -1867,7 +1867,7 @@ config_parse_commandline(int argc, char **argv, int ignore_errors,
     }
 
     if (want_arg && i == argc-1) {
-      if (!strcmp(argv[i],"--hash-password") || ignore_errors) {
+      if (ignore_errors) {
         arg = strdup("");
       } else {
         log_warn(LD_CONFIG,"Command-line option '%s' with no value. Failing.",