commit d79d648edcc19d1f11758016108fdbb57c80b4d0 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 17 11:22:16 2011 -0400
Don't write ControlPorts to disk till after we setuid and make datadir
Fix for bug 3747; bugfix on 0.2.2.26-beta. --- changes/bug3747 | 6 ++++++ src/or/config.c | 3 +++ src/or/connection.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/changes/bug3747 b/changes/bug3747 new file mode 100644 index 0000000..052dab1 --- /dev/null +++ b/changes/bug3747 @@ -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. \ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index e0ecab2..7202ea2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1034,6 +1034,9 @@ options_act_reversible(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); diff --git a/src/or/connection.c b/src/or/connection.c index c791309..2049f42 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1061,9 +1061,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);