Commit 891cf72f authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Merge branch 'bug5095_squashed'

parents d9ceab5b b41dd806

changes/bug5095

0 → 100644
+4 −0
Changes for changes/bug5095: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - When we receive a SIGHUP and the controller-use __ReloadTorrcOnSIGHUP

      option is set to 0, perform other actions that SIGHUP usually causes

      (like reopening the logs). Fixes bug 5095; bugfix on 0.2.1.9-alpha.

src/or/config.c

+3 −1
Changes for src/or/config.c: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ set_options(or_options_t *new_val, char **msg) 
  }

  /* Issues a CONF_CHANGED event to notify controller of the change. If Tor is

   * just starting up then the old_options will be undefined. */

  if (old_options) {

  if (old_options && old_options != global_options) {

    elements = smartlist_new();

    for (i=0; options_format.vars[i].name; ++i) {

      const config_var_t *var = &options_format.vars[i];
@@ -774,6 +774,8 @@ set_options(or_options_t *new_val, char **msg) 
    control_event_conf_changed(elements);

    smartlist_free(elements);

  }



  if (old_options != global_options)

    config_free(&options_format, old_options);



  return 0;

src/or/main.c

+8 −0
Changes for src/or/main.c: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1773,8 +1773,16 @@ do_hup(void) 
    }

    options = get_options(); /* they have changed now */

  } else {

    char *msg = NULL;

    log_notice(LD_GENERAL, "Not reloading config file: the controller told "

               "us not to.");

    /* Make stuff get rescanned, reloaded, etc. */

    if (set_options((or_options_t*)options, &msg) < 0) {

      if (!msg)

        msg = tor_strdup("Unknown error");

      log_warn(LD_GENERAL, "Unable to re-set previous options: %s", msg);

      tor_free(msg);

    }

  }

  if (authdir_mode_handles_descs(options, -1)) {

    /* reload the approved-routers file */