[or-cvs] Warn if ReachableAddresses is set when also ReachableDirAdd...

[weasel@xxxxxxxx (Peter Palfrader)]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv14784

Modified Files:
	config.c 
Log Message:
Warn if ReachableAddresses is set when also ReachableDirAddresses and ReachableORAddresses are set.

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -p -d -r1.513 -r1.514
--- config.c	13 Feb 2006 21:17:19 -0000	1.513
+++ config.c	13 Feb 2006 22:29:37 -0000	1.514
@@ -1837,6 +1837,12 @@ parse_reachable_addresses(void)
 {
   or_options_t *options = get_options();
 
+  if (options->ReachableDirAddresses &&
+      options->ReachableORAddresses &&
+      options->ReachableAddresses)
+    log_warn(LD_CONFIG, "Both ReachableDirAddresses and ReachableORAddresses are set. "
+                        "ReachableAddresses setting will be ignored.");
+
   addr_policy_free(reachable_or_addr_policy);
   reachable_or_addr_policy = NULL;
   if (!options->ReachableORAddresses && options->ReachableAddresses)