[tor-commits] [vidalia/master] Explicitly disable SocksPort auto

[chiiph at torproject.org]

commit 184f638815a00101be86eaa2c5f62d27d8eff62f
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Jan 20 20:56:45 2012 -0300

    Explicitly disable SocksPort auto
---
 src/vidalia/config/TorSettings.cpp |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp
index d45d88e..3070c09 100644
--- a/src/vidalia/config/TorSettings.cpp
+++ b/src/vidalia/config/TorSettings.cpp
@@ -59,6 +59,7 @@
 #define TOR_ARG_DATA_DIRECTORY  "DataDirectory"
 #define TOR_ARG_HASHED_PASSWORD "HashedControlPassword"
 #define TOR_ARG_COOKIE_AUTH     "CookieAuthentication"
+#define TOR_ARG_SOCKSPORT       "SocksPort"
 
 /** Generate random control passwords of 16 characters */
 #define PASSWORD_LEN    16
@@ -105,6 +106,11 @@ TorSettings::apply(QString *errmsg)
 
   conf.insert(SETTING_CONTROL_PORT,
               localValue(SETTING_CONTROL_PORT).toString());
+
+  if(localValue(SETTING_AUTOCONTROL).toBool())
+    conf.insert(TOR_ARG_SOCKSPORT, "auto");
+  else
+    conf.insert(TOR_ARG_SOCKSPORT, "9050");
   
   AuthenticationMethod authMethod = 
     toAuthenticationMethod(localValue(SETTING_AUTH_METHOD).toString());