r19091@catbus: nickm | 2008-03-27 12:42:57 -0400

 Stop reading torrc when all we want to do is --hash-password.  Fix based on patch from Sebastian Hahn. Backport candidate.


svn:r14214

1 files changed, 7 insertions, 3 deletions

diff --git a/src/or/config.c b/src/or/config.c
index f0d890202..10ddf590c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3681,9 +3681,13 @@ options_init_from_torrc(int argc, char **argv)
     }
   }
 
-  cf = load_torrc_from_disk(argc, argv);
-  if (!cf)
-    goto err;
+  if (command == CMD_HASH_PASSWORD) {
+    cf = tor_strdup("");
+  } else {
+    cf = load_torrc_from_disk(argc, argv);
+    if (!cf)
+      goto err;
+  }
 
   retval = options_init_from_string(cf, command, command_arg, &errmsg);
   tor_free(cf);