Don't write ControlPorts to disk till after we setuid and make datadir

Fix for bug 3747; bugfix on 0.2.2.26-beta.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/or/config.c b/src/or/config.c
index e0ecab2d41..7202ea254c 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 c791309d68..2049f4240c 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);