Clear all control.c flags on control_free_all()

Fixes bug 25512.

diff --git a/changes/bug25512 b/changes/bug25512
new file mode 100644 (file)
index 0000000..4b64918
--- /dev/null
+++ b/changes/bug25512
@@ -0,0 +1,5 @@
+  o Minor bugfixes (restart-in-process):
+    - When shutting down, Tor now clears all the flags in the control.c
+      module. This should prevent a bug where authentication cookies
+      are not generated on restart. Fixes bug 25512; bugfix on 0.3.3.1-alpha.
+

diff --git a/src/or/control.c b/src/or/control.c
index 7786e1648154c1dabd7570d8bd3f8db27572a1ec..edbc2f70fbadec7802fb3f81bdd13f6efdfc95ab 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -7602,6 +7602,11 @@ control_free_all(void)
   bootstrap_percent = BOOTSTRAP_STATUS_UNDEF;
   notice_bootstrap_percent = 0;
   bootstrap_problems = 0;
+  authentication_cookie_is_set = 0;
+  global_event_mask = 0;
+  disable_log_messages = 0;
+  memset(last_sent_bootstrap_message, 0, sizeof(last_sent_bootstrap_message));
+  flush_queued_event_pending = 0;
 }
 
 #ifdef TOR_UNIT_TESTS