Don't crash a bridge authority on SIGHUP if it's not in the consensus

Fixes bug 2572.

diff --git a/changes/bug2572 b/changes/bug2572
new file mode 100644 (file)
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 26ac351fc468b4116f8d1633c9e290b75259fff0..59276bac3a5b46b75cbb92939669aab1931bac98 100644 (file)
--- 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. */