[or-cvs] r12778: but don't disable all the default v1 authorities quite yet (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-12-11 23:46:16 -0500 (Tue, 11 Dec 2007)
New Revision: 12778

Modified:
   tor/trunk/src/or/config.c
Log:
but don't disable all the default v1 authorities quite yet


Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-12-12 04:38:54 UTC (rev 12777)
+++ tor/trunk/src/or/config.c	2007-12-12 04:46:16 UTC (rev 12778)
@@ -889,7 +889,7 @@
 {
   config_line_t *cl;
   int need_to_update =
-    !smartlist_len(router_get_trusted_dir_servers()) ||
+    !smartlist_len(router_get_trusted_dir_servers()) || !old_options ||
     !config_lines_eq(options->DirServers, old_options->DirServers) ||
     !config_lines_eq(options->AlternateBridgeAuthority,
                      old_options->AlternateBridgeAuthority) ||
@@ -910,7 +910,7 @@
     if (!options->AlternateBridgeAuthority)
       type |= BRIDGE_AUTHORITY;
     if (!options->AlternateDirAuthority)
-      type |= V2_AUTHORITY | V3_AUTHORITY;
+      type |= V1_AUTHORITY | V2_AUTHORITY | V3_AUTHORITY;
     if (!options->AlternateHSAuthority)
       type |= HIDSERV_AUTHORITY;
     add_default_trusted_dir_authorities(type);