Commit 73a4c069 authored by Chris Ball's avatar Chris Ball Committed by Nick Mathewson
Browse files

Bug #919: Don't rebind ports if we receive SIGHUP while hibernating.

parent 9ffa9779

changes/bug919

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Fix a regression that caused Tor to rebind its ports if it receives

      SIGHUP while hibernating.  Bugfix in 0.1.1.6-alpha, closes bug 919.

src/or/config.c

+6 −4
Original line number Diff line number Diff line
@@ -950,12 +950,14 @@ options_act_reversible(or_options_t *old_options, char **msg) 
    }



    /* Launch the listeners.  (We do this before we setuid, so we can bind to

     * ports under 1024.) */

     * ports under 1024.)  We don't want to rebind if we're hibernating. */

    if (!we_are_hibernating()) {

      if (retry_all_listeners(replaced_listeners, new_listeners) < 0) {

        *msg = tor_strdup("Failed to bind one of the listener ports.");

        goto rollback;

      }

    }

  }



#if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H)

  /* Open /dev/pf before dropping privileges. */