[or-cvs] r12001: Patch from robert hogan: do not reset trusted dir server lis (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-17 15:23:52 -0400 (Wed, 17 Oct 2007)
New Revision: 12001

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
Log:
 r15880 at catbus:  nickm | 2007-10-17 14:56:51 -0400
 Patch from robert hogan: do not reset trusted dir server list when we get a config option.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-10-17 16:55:44 UTC (rev 12000)
+++ tor/trunk/ChangeLog	2007-10-17 19:23:52 UTC (rev 12001)
@@ -33,8 +33,14 @@
     - When we're configured to be a v3 authority, but we're only listed
       as a non-v3 authority in our DirServer line for ourself, correct the
       listing.
+
+  o Minor bugfixes (v3 directory protocol)
     - Delete unverified-consensus when the real consensus is set.
 
+  o Minor bugfixes (controller):
+    - Don't reset trusted dir server list when we set a configuration option.
+      (Patch from Robert Hogan.)
+
   o Minor bugfixes (memory leaks):
     - Stop leaking memory on failing case of base32_decode.  Bugfix on
       0.2.0.7-alpha.

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-10-17 16:55:44 UTC (rev 12000)
+++ tor/trunk/src/or/config.c	2007-10-17 19:23:52 UTC (rev 12001)
@@ -477,7 +477,7 @@
     "and servers." },
   { "ORListenAddress", "Bind to this address to listen for connections from "
     "clients and servers, instead of the default 0.0.0.0:ORPort." },
-  { "PublishServerDescriptors", "Set to \"\" to keep the server from "
+  { "PublishServerDescriptor", "Set to \"\" to keep the server from "
     "uploading info to the directory authorities." },
   /*{ "RedirectExit", "When an outgoing connection tries to connect to a "
    *"given address, redirect it to another address instead." },
@@ -963,8 +963,8 @@
   int running_tor = options->command == CMD_RUN_TOR;
   char *msg;
 
-  clear_trusted_dir_servers();
   if (options->DirServers) {
+    clear_trusted_dir_servers();
     for (cl = options->DirServers; cl; cl = cl->next) {
       if (parse_dir_server_line(cl->value, 0)<0) {
         log_warn(LD_BUG,
@@ -973,7 +973,8 @@
       }
     }
   } else {
-    add_default_trusted_dirservers();
+    if (!router_get_trusted_dir_servers())
+      add_default_trusted_dirservers();
   }
 
   clear_bridge_list();