diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-08-27 06:10:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-28 08:33:43 -0400 |
| commit | 37a76d75dd38a1ebd45627bb6e29e40f60917188 (patch) | |
| tree | 82b416e4f8f917ab7081037afad721f97415ef2b | |
| parent | b159ffb675a274b285acc55204eaf6e83cd72bf8 (diff) | |
| download | tor-37a76d75dd38a1ebd45627bb6e29e40f60917188.tar.gz tor-37a76d75dd38a1ebd45627bb6e29e40f60917188.zip | |
Resume expanding abbreviations for command-line options
The fix for bug 4647 accidentally removed our hack from bug 586 that
rewrote HashedControlPassword to __HashedControlSessionPassword when
it appears on the commandline (which allowed the user to set her own
HashedControlPassword in the torrc file while the controller generates
a fresh session password for each run).
Fixes bug 12948; bugfix on 0.2.5.1-alpha.
| -rw-r--r-- | changes/bug12948 | 8 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/changes/bug12948 b/changes/bug12948 new file mode 100644 index 0000000000..431c0a1019 --- /dev/null +++ b/changes/bug12948 @@ -0,0 +1,8 @@ + o Major bugfixes: + - Resume expanding abbreviations for command-line options. The fix + for bug 4647 accidentally removed our hack from bug 586 that rewrote + HashedControlPassword to __HashedControlSessionPassword when it + appears on the commandline (which allowed the user to set her + own HashedControlPassword in the torrc file while the controller + generates a fresh session password for each run). Fixes bug 12948; + bugfix on 0.2.5.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 6bb620937a..921503b4b9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1932,7 +1932,8 @@ config_parse_commandline(int argc, char **argv, int ignore_errors, } param = tor_malloc_zero(sizeof(config_line_t)); - param->key = is_cmdline ? tor_strdup(argv[i]) : tor_strdup(s); + param->key = is_cmdline ? tor_strdup(argv[i]) : + tor_strdup(config_expand_abbrev(&options_format, s, 1, 1)); param->value = arg; param->command = command; param->next = NULL; |