mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/config.c
This commit is contained in:
commit
06be6105e4
6
changes/bug3747
Normal file
6
changes/bug3747
Normal file
@ -0,0 +1,6 @@
|
||||
o Major bugfixes:
|
||||
- Write control ports to disk only after switching UID and
|
||||
creating the data directory. This way, we don't fail when
|
||||
starting up with a nonexistant DataDirectory and a
|
||||
ControlPortWriteToFile setting based on that directory. Fixes
|
||||
bug 3747; bugfix on Tor 0.2.2.26-beta.
|
@ -1120,6 +1120,9 @@ 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)) {
|
||||
size_t len = strlen(options->DataDirectory)+32;
|
||||
char *fn = tor_malloc(len);
|
||||
|
@ -987,9 +987,6 @@ connection_create_listener(const struct sockaddr *listensockaddr,
|
||||
"%s listening on port %u.",
|
||||
conn_type_to_string(type), gotPort);
|
||||
|
||||
if (type == CONN_TYPE_CONTROL_LISTENER)
|
||||
control_ports_write_to_file();
|
||||
|
||||
conn->state = LISTENER_STATE_READY;
|
||||
if (start_reading) {
|
||||
connection_start_reading(conn);
|
||||
|
Loading…
Reference in New Issue
Block a user