[tor-commits] [tor/maint-0.2.2] Don't crash a bridge authority on SIGHUP if it's not in the consensus

[nickm at torproject.org]

commit 444a955e4a3877e9a7b3016deee9f1f4dfafdd93
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Wed Feb 16 04:12:37 2011 -0800

    Don't crash a bridge authority on SIGHUP if it's not in the consensus
    
    Fixes bug 2572.
---
 changes/bug2572 |    5 +++++
 src/or/router.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/changes/bug2572 b/changes/bug2572
new file mode 100644
index 0000000..a5cca28
--- /dev/null
+++ b/changes/bug2572
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Don't crash a bridge authority on SIGHUP if it can't force itself
+      into its routerlist.  Fixes bug 2572.
+
+
diff --git a/src/or/router.c b/src/or/router.c
index 26ac351..59276ba 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -629,7 +629,7 @@ init_keys(void)
   /* 4. Build our router descriptor. */
   /* Must be called after keys are initialized. */
   mydesc = router_get_my_descriptor();
-  if (authdir_mode(options)) {
+  if (authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL)) {
     const char *m = NULL;
     routerinfo_t *ri;
     /* We need to add our own fingerprint so it gets recognized. */