[or-cvs] We are an OR if ORPort *or* ORBindAddress is set; similarly...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	main.c 
Log Message:
We are an OR if ORPort *or* ORBindAddress is set; similarly for being an OP

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- main.c	15 Aug 2004 08:15:12 -0000	1.318
+++ main.c	15 Aug 2004 20:16:26 -0000	1.319
@@ -465,7 +465,7 @@
 /** Return true iff we are trying to be a server.
  */
 int server_mode(void) {
-  return (options.ORPort != 0);
+  return (options.ORPort != 0 || options.ORBindAddress);
 }
 
 /** Remember if we've advertised ourselves to the dirservers. */
@@ -479,7 +479,7 @@
 
 /** Return true iff we are trying to be a socks proxy. */
 int proxy_mode(void) {
-  return (options.SocksPort != 0);
+  return (options.SocksPort != 0 || options.SocksBindAddress);
 }
 
 /** Perform regular maintenance tasks.  This function gets run once per