Commit 12b217bc authored Mar 27, 2008 by Nick Mathewson

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

parent 932b5781

ChangeLog

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
		leaks. Bugfix on 0.2.0.19-alpha.
		- Free static hashtables for policy maps and for TLS connections on
		shutdown, so they don't look like memory leaks. Bugfix on 0.2.0.x.
		- Do not read the configuration file when we've only been told to
		generate a password hash. Bugfix on 0.0.9pre5. Fix based on patch
		from Sebastian Hahn.

		o Minor features:
		- Allow separate log levels to be configured for different logging

src/or/config.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -3681,9 +3681,13 @@ options_init_from_torrc(int argc, char **argv)
		}
		}

		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);