[or-cvs] bugfix: only try to use the EntryNodes config option if it ...

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	config.c 
Log Message:
bugfix: only try to use the EntryNodes config option if it is set.


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -p -d -r1.476 -r1.477
--- config.c	2 Jan 2006 05:00:03 -0000	1.476
+++ config.c	2 Jan 2006 05:14:21 -0000	1.477
@@ -704,8 +704,9 @@ options_act(or_options_t *old_options)
   }
 
   /* Check if we need to parse and add the EntryNodes config option. */
-  if (!old_options ||
-      !opt_streq(old_options->EntryNodes, options->EntryNodes))
+  if (options->EntryNodes &&
+      (!old_options ||
+       !opt_streq(old_options->EntryNodes, options->EntryNodes)))
     entry_nodes_should_be_added();
 
   /* Since our options changed, we might need to regenerate and upload our