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

changes suggested by weasel

Browse Source
This commit is contained in:
Nick Mathewson 2015-01-16 11:46:20 -05:00
parent 6bb31cba12
commit 31838bd783
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/config.c
View File

@ -6441,8 +6441,6 @@ write_configuration_file(const char *fname, const or_options_t *options)
if (!fname)
return -1;
tor_assert(fname);
switch (file_status(fname)) {
case FN_FILE:
old_val = read_file_to_str(fname, 0, NULL);

10
src/or/control.c
View File

@ -1439,11 +1439,13 @@ getinfo_helper_misc(control_connection_t *conn, const char *question,
if (!strcmp(question, "version")) {
*answer = tor_strdup(get_version());
} else if (!strcmp(question, "config-file")) {
if (get_torrc_fname(0))
*answer = tor_strdup(get_torrc_fname(0));
const char *a = get_torrc_fname(0);
if (a)
*answer = tor_strdup(a);
} else if (!strcmp(question, "config-defaults-file")) {
if (get_torrc_fname(1))
*answer = tor_strdup(get_torrc_fname(1));
const char *a = get_torrc_fname(1);
if (a)
*answer = tor_strdup(a);
} else if (!strcmp(question, "config-text")) {
*answer = options_dump(get_options(), OPTIONS_DUMP_MINIMAL);
} else if (!strcmp(question, "info/names")) {