Commit a95cfb8a authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Clear all control.c flags on control_free_all() 

Fixes bug 25512.

(Cherry-picked from 3519d0c8
parent f721a082

changes/bug25512

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
  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.

src/or/control.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -7610,6 +7610,14 @@ control_free_all(void) 
    tor_event_free(flush_queued_events_event);

    tor_event_free(flush_queued_events_event);

    flush_queued_events_event = NULL;

    flush_queued_events_event = NULL;

  }

  }

  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

#ifdef TOR_UNIT_TESTS
@@ -7620,4 +7628,3 @@ control_testing_set_global_event_mask(uint64_t mask) 
  global_event_mask = mask;

  global_event_mask = mask;

}

}

#endif /* defined(TOR_UNIT_TESTS) */
 
#endif /* defined(TOR_UNIT_TESTS) */