[or-cvs] r18833: {tor} In tor-resolve, when the Tor client to use is specified by < (in tor/trunk: . src/tools)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2009-03-09 20:52:45 -0400 (Mon, 09 Mar 2009)
New Revision: 18833

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/tools/tor-resolve.c
Log:
In tor-resolve, when the Tor client to use is specified by <hostname>:<port>, actually use the specified port rather than defaulting to 9050

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2009-03-09 22:18:02 UTC (rev 18832)
+++ tor/trunk/ChangeLog	2009-03-10 00:52:45 UTC (rev 18833)
@@ -3,6 +3,9 @@
     - Avoid trying to print raw memory to the logs when we decide to
       give up on downloading a given relay descriptor. Bugfix on
       0.2.1.9-alpha.
+    - In tor-resolve, when the Tor client to use is specified by
+      <hostname>:<port>, actually use the specified port rather than
+      defaulting to 9050. Bugfix on 0.2.1.6-alpha.
 
 
 Changes in version 0.2.1.13-alpha - 2009-03-09

Modified: tor/trunk/src/tools/tor-resolve.c
===================================================================
--- tor/trunk/src/tools/tor-resolve.c	2009-03-09 22:18:02 UTC (rev 18832)
+++ tor/trunk/src/tools/tor-resolve.c	2009-03-10 00:52:45 UTC (rev 18833)
@@ -388,7 +388,7 @@
                (int)socksport, (int)port_option);
     } else if (port_option) {
       socksport = port_option;
-    } else {
+    } else if (!socksport) {
       log_debug(LD_CONFIG, "defaulting to port 9050");
       socksport = 9050;
     }