From 37a76d75dd38a1ebd45627bb6e29e40f60917188 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 27 Aug 2014 06:10:35 -0400 Subject: 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. --- src/or/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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; -- cgit v1.2.3-54-g00ecf