Browse Source

We were refusing to start if you define SocksListenAddress
but define SocksPort to be 0. But this is a standard configuration!
So don't fail.


svn:r5361

Roger Dingledine 19 years ago
parent
commit
014c6bfe00
1 changed files with 2 additions and 0 deletions
  1. 2 0
      src/or/config.c

+ 2 - 0
src/or/config.c

@@ -1747,8 +1747,10 @@ options_validate(or_options_t *options)
   if (options->DirPort == 0 && options->DirListenAddress != NULL)
   if (options->DirPort == 0 && options->DirListenAddress != NULL)
     REJECT("DirPort must be defined if DirListenAddress is defined.");
     REJECT("DirPort must be defined if DirListenAddress is defined.");
 
 
+#if 0 /* don't complain, since a standard configuration does this! */
   if (options->SocksPort == 0 && options->SocksListenAddress != NULL)
   if (options->SocksPort == 0 && options->SocksListenAddress != NULL)
     REJECT("SocksPort must be defined if SocksListenAddress is defined.");
     REJECT("SocksPort must be defined if SocksListenAddress is defined.");
+#endif
 
 
   if (validate_data_directory(options)<0)
   if (validate_data_directory(options)<0)
     REJECT("Invalid DataDirectory");
     REJECT("Invalid DataDirectory");