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

No longer writing control ports to file if updating reversible options fail. Fixes #5605.

Browse Source
This commit is contained in:
Kevin Butler 2013-09-02 19:25:08 +01:00
parent 00bcc25d05
commit b336e8c74e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/bug5605 Normal file
View File

@ -0,0 +1,2 @@
o Minor Bugfixes:
- No longer writing control ports to file if updating reversible options fail. Fixes #5605.

6
src/or/config.c
View File

@ -1115,9 +1115,6 @@ options_act_reversible(const or_options_t *old_options, char **msg)
/* No need to roll back, since you can't change the value. */
}
/* Write control ports to disk as appropriate */
control_ports_write_to_file();
if (directory_caches_v2_dir_info(options)) {
char *fn = NULL;
tor_asprintf(&fn, "%s"PATH_SEPARATOR"cached-status",
@ -1315,6 +1312,9 @@ options_act(const or_options_t *old_options)
}
}
/* Write control ports to disk as appropriate */
control_ports_write_to_file();
if (running_tor && !have_lockfile()) {
if (try_locking(options, 1) < 0)
return -1;