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

Stop discarding command-line arguments when TestingTorNetwork is set

Browse Source 
Discovered by Kevin Bauer. Fixes bug 5373; bugfix on 0.2.3.9-alpha,
where task 4552 added support for two layers of torrc files.
This commit is contained in:
Roger Dingledine 2012-03-14 02:40:04 -04:00
parent 279f03e76f
commit 12594f27db
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug5373 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes:
- Stop discarding command-line arguments when TestingTorNetwork
is set. Discovered by Kevin Bauer. Fixes bug 5373; bugfix on
0.2.3.9-alpha, where task 4552 added support for two layers of
torrc files.

7
src/or/config.c
View File

@ -4660,6 +4660,13 @@ options_init_from_string(const char *cf_defaults, const char *cf,
if (i==0)
newdefaultoptions = options_dup(&options_format, newoptions);
}
/* Assign command-line variables a second time too */
retval = config_assign(&options_format, newoptions,
global_cmdline_options, 0, 0, msg);
if (retval < 0) {
err = SETOPT_ERR_PARSE;
goto err;
}
}
/* Validate newoptions */