[or-cvs] ORPort must be defined if ORBindAddress is defined.

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	config.c 
Log Message:
ORPort must be defined if ORBindAddress is defined.


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -d -r1.281 -r1.282
--- config.c	7 Dec 2004 06:27:39 -0000	1.281
+++ config.c	7 Dec 2004 06:51:46 -0000	1.282
@@ -1137,6 +1137,12 @@
     result = -1;
   }
 
+  /* XXX might similarly want to check the other *BindAddress options */
+  if (options->ORPort == 0 && options->ORBindAddress != NULL) {
+    log(LOG_WARN, "ORPort must be defined if ORBindAddress is defined.");
+    result = -1;
+  }
+
   if (validate_data_directory(options)<0) {
     log(LOG_WARN, "Invalid DataDirectory");
     result = -1;