[or-cvs] Add default trusted-dir-server entries only when no dirserv...

[Nick Mathewson]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv23162/or

Modified Files:
	or.h routerlist.c 
Log Message:
Add default trusted-dir-server entries only when no dirserver lines are given in the config file

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -d -r1.426 -r1.427
--- or.h	13 Oct 2004 01:13:37 -0000	1.426
+++ or.h	13 Oct 2004 19:56:42 -0000	1.427
@@ -902,7 +902,6 @@
 
   struct config_line_t *DirServers; /**< List of configuration lines
                                      * for directory servers. */
-
 } or_options_t;
 
 /* XXX are these good enough defaults? */
@@ -1455,6 +1454,8 @@
                                         time_t list_time,
                                         smartlist_t *running_list);
 void add_trusted_dir_server(const char *addr, uint16_t port,const char *digest);
+void clear_trusted_dir_servers(void);
+
 
 /********************************* routerparse.c ************************/
 

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerlist.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- routerlist.c	13 Oct 2004 18:28:39 -0000	1.150
+++ routerlist.c	13 Oct 2004 19:56:42 -0000	1.151
@@ -27,7 +27,6 @@
 router_pick_trusteddirserver_impl(int requireother, int fascistfirewall);
 static void mark_all_trusteddirservers_up(void);
 static int router_resolve_routerlist(routerlist_t *dir);
-static void clear_trusted_dir_servers(void);
 
 /****************************************************************************/
 
@@ -1162,7 +1161,7 @@
   smartlist_add(trusted_dir_servers, ent);
 }
 
-static void clear_trusted_dir_servers(void)
+void clear_trusted_dir_servers(void)
 {
   if (trusted_dir_servers) {
     SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ent,