[or-cvs] r12111: fix a dumb bug in r12102. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-22 18:54:28 -0400 (Mon, 22 Oct 2007)
New Revision: 12111

Modified:
   tor/trunk/
   tor/trunk/src/or/config.c
Log:
 r16051 at catbus:  nickm | 2007-10-22 18:53:53 -0400
 fix a dumb bug in r12102.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16051] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-10-22 19:31:50 UTC (rev 12110)
+++ tor/trunk/src/or/config.c	2007-10-22 22:54:28 UTC (rev 12111)
@@ -1120,14 +1120,16 @@
     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;