nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.5'

Browse Source
This commit is contained in:
Nick Mathewson 2014-08-28 08:36:00 -04:00
commit cc3b04a8c1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug12948 Normal file
View File

@ -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.

3
src/or/config.c
View File

@ -1935,7 +1935,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;