[or-cvs] r9541: backport: If we start a server with ClientOnly 1, then set C (in tor/branches/tor-0_1_1-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-02-08 19:42:38 -0500 (Thu, 08 Feb 2007)
New Revision: 9541

Modified:
   tor/branches/tor-0_1_1-patches/ChangeLog
   tor/branches/tor-0_1_1-patches/src/or/config.c
Log:
backport:
If we start a server with ClientOnly 1, then set ClientOnly to 0
and hup, stop triggering an assert based on an empty onion_key.


Modified: tor/branches/tor-0_1_1-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_1-patches/ChangeLog	2007-02-09 00:22:43 UTC (rev 9540)
+++ tor/branches/tor-0_1_1-patches/ChangeLog	2007-02-09 00:42:38 UTC (rev 9541)
@@ -13,6 +13,8 @@
       bug 382.)
     - Refactor the way we handle pending circuits when an OR connection
       completes or fails, to fix a rare crash bug.
+    - If we start a server with ClientOnly 1, then set ClientOnly to 0
+      and hup, stop triggering an assert based on an empty onion_key.
 
 
 Changes in version 0.1.1.26 - 2006-12-14

Modified: tor/branches/tor-0_1_1-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_1_1-patches/src/or/config.c	2007-02-09 00:22:43 UTC (rev 9540)
+++ tor/branches/tor-0_1_1-patches/src/or/config.c	2007-02-09 00:42:38 UTC (rev 9541)
@@ -2553,6 +2553,7 @@
       old_options->NumCpus != new_options->NumCpus ||
       old_options->ORPort != new_options->ORPort ||
       old_options->SafeLogging != new_options->SafeLogging ||
+      old_options->ClientOnly != new_options->ClientOnly ||
       !config_lines_eq(old_options->Logs, new_options->Logs))
     return 1;