nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set torrc_fname in load_torrc_from_disk

Browse Source 
Bugfix on commit 230422b955, not yet in any
release. Fixes bug #4604; reported by koolfy.
This commit is contained in:
Robert Ransom 2011-11-29 17:11:49 -08:00
parent 83f66db79e
commit 4150d92eea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/config.c
View File

@ -4385,7 +4385,7 @@ load_torrc_from_disk(int argc, char **argv, int defaults_file)
char *cf = NULL; char *cf = NULL;
int using_default_torrc = 1; int using_default_torrc = 1;
int ignore_missing_torrc = 0; int ignore_missing_torrc = 0;
char **fname_var = defaults_file ? &torrc_fname : &torrc_defaults_fname; char **fname_var = defaults_file ? &torrc_defaults_fname : &torrc_fname;
fname = find_torrc_filename(argc, argv, defaults_file, fname = find_torrc_filename(argc, argv, defaults_file,
&using_default_torrc, &ignore_missing_torrc); &using_default_torrc, &ignore_missing_torrc);