r16051@catbus: nickm | 2007-10-22 18:53:53 -0400

 fix a dumb bug in r12102.

svn:r12111

diff --git a/src/or/config.c b/src/or/config.c
index eb2f50bd0dbced3bc2b5738361a8b76ac310f881..b4d7e3e87ac4e08c01cfd32ecd58245d0d34c70b 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1120,14 +1120,16 @@ options_act(or_options_t *old_options)
     mark_my_descriptor_dirty();
 
   /* We may need to reschedule some directory stuff if our status changed. */
-  if (authdir_mode_v3(options) && !authdir_mode_v3(old_options))
-    dirvote_recalculate_timing(options, time(NULL));
-  if (!bool_eq(dirserver_mode(options), dirserver_mode(old_options))) {
-    /* Make sure update_router_have_min_dir_info gets called. */
-    router_dir_info_changed();
-    /* We might need to download a new consensus status later or sooner than
-     * we had expected. */
-    update_consensus_networkstatus_fetch_time(time(NULL));
+  if (old_options) {
+    if (authdir_mode_v3(options) && !authdir_mode_v3(old_options))
+      dirvote_recalculate_timing(options, time(NULL));
+    if (!bool_eq(dirserver_mode(options), dirserver_mode(old_options))) {
+      /* Make sure update_router_have_min_dir_info gets called. */
+      router_dir_info_changed();
+      /* We might need to download a new consensus status later or sooner than
+       * we had expected. */
+      update_consensus_networkstatus_fetch_time(time(NULL));
+    }
   }
 
   return 0;