[or-cvs] r9662: Add a missing set to onion_key_set_at to avoid premature rot (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-02-26 22:53:40 -0500 (Mon, 26 Feb 2007)
New Revision: 9662

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/router.c
Log:
 r11958 at catbus:  nickm | 2007-02-26 22:28:03 -0500
 Add a missing set to onion_key_set_at to avoid premature rotates.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-02-27 00:26:20 UTC (rev 9661)
+++ tor/trunk/ChangeLog	2007-02-27 03:53:40 UTC (rev 9662)
@@ -1,3 +1,9 @@
+Changes in version 0.1.2.9-??? - 2007-??-??
+  o Minor bugfixes (server):
+    - Do not rotate onion key immediately after setting it for the first
+      time.
+
+
 Changes in version 0.1.2.8-beta - 2007-02-26
   o Major bugfixes (crashes):
     - Stop crashing when the controller asks us to resetconf more than

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-02-27 00:26:20 UTC (rev 9661)
+++ tor/trunk/src/or/router.c	2007-02-27 03:53:40 UTC (rev 9662)
@@ -291,7 +291,7 @@
      * or it's a holdover from 0.1.2.4-alpha-dev or earlier.  In either case,
      * start the clock ticking now so that we will eventually rotate it even
      * if we don't stay up for a full MIN_ONION_KEY_LIFETIME. */
-    state->LastRotatedOnionKey = time(NULL);
+    state->LastRotatedOnionKey = onionkey_set_at = time(NULL);
     or_state_mark_dirty(state, options->AvoidDiskWrites ? time(NULL)+3600 : 0);
   }