[or-cvs] r12014: Backport: Patch from robert hogan: do not reset trusted dir (in tor/branches/tor-0_1_2-patches: . doc src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-10-18 07:56:56 -0400 (Thu, 18 Oct 2007)
New Revision: 12014

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/doc/TODO.012
   tor/branches/tor-0_1_2-patches/src/or/config.c
Log:
 r15881@catbus:  nickm | 2007-10-17 14:59:36 -0400
 Backport: Patch from robert hogan: do not reset trusted dir server list when we get a config option.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r15881] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-10-18 11:50:20 UTC (rev 12013)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-10-18 11:56:56 UTC (rev 12014)
@@ -49,6 +49,8 @@
     - It's not actually an error to find a non-pending entry in the DNS
       cache when canceling a pending resolve. Don't log unless stuff
       is fishy. Resolves bug 463.
+    - Don't reset trusted dir server list when we set a configuration option.
+      (Patch from Robert Hogan.)
 
 
 Changes in version 0.1.2.17 - 2007-08-30

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-10-18 11:50:20 UTC (rev 12013)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-10-18 11:56:56 UTC (rev 12014)
@@ -14,4 +14,5 @@
   o r11499, r11500, r11501: hidserv hexdigests rather than nicknames
   o r11829: Don't warn when cancel_pending_resolve() finds a cached failure.
   o r11915: just because you hup, don't publish a near-duplicate descriptor
-
+  - r11994: Call routerlist_remove_old_routers() less.  This will be a
+	    tricky backport.

Modified: tor/branches/tor-0_1_2-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/config.c	2007-10-18 11:50:20 UTC (rev 12013)
+++ tor/branches/tor-0_1_2-patches/src/or/config.c	2007-10-18 11:56:56 UTC (rev 12014)
@@ -441,7 +441,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 0 in order to keep the server from "
+  { "PublishServerDescriptor", "Set to 0 in order 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." },
@@ -885,8 +885,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_err(LD_BUG,
@@ -895,7 +895,8 @@
       }
     }
   } else {
-    add_default_trusted_dirservers();
+    if (!router_get_trusted_dir_servers())
+      add_default_trusted_dirservers();
   }
 
   if (running_tor && rend_config_services(options, 0)<0) {