[vidalia-svn] r3755: Slightly different patch for r3748. (in vidalia/branches/vidalia-0.1: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-05-01 22:57:49 -0400 (Fri, 01 May 2009)
New Revision: 3755

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/src/vidalia/config/
   vidalia/branches/vidalia-0.1/src/vidalia/config/torsettings.cpp
Log:

Slightly different patch for r3748.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732,3740,3745
/vidalia/trunk/cmake:3745
   + /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732,3740,3745,3754
/vidalia/trunk/cmake:3745


Property changes on: vidalia/branches/vidalia-0.1/src/vidalia/config
___________________________________________________________________
Added: svn:mergeinfo
   + /vidalia/trunk:3754
/vidalia/trunk/src/vidalia/config:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3754

Modified: vidalia/branches/vidalia-0.1/src/vidalia/config/torsettings.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/config/torsettings.cpp	2009-05-02 02:34:52 UTC (rev 3754)
+++ vidalia/branches/vidalia-0.1/src/vidalia/config/torsettings.cpp	2009-05-02 02:57:49 UTC (rev 3755)
@@ -16,7 +16,6 @@
 
 #include <QDir>
 #include <QProcess>
-#include <torprocess.h>
 #include <crypto.h>
 #include <vidalia.h>
 
@@ -300,10 +299,21 @@
 TorSettings::hashPassword(const QString &password)
 {
   TorSettings settings;
-  TorProcess tor;
+  QProcess tor;
   QString dataDirectory, line;
   QStringList args;
 
+  QStringList env = QProcess::systemEnvironment();
+#if !defined(Q_OS_WIN32)
+  /* Add "/usr/sbin" to an existing $PATH, so this works on Debian too. */
+  for (int i = 0; i < env.size(); i++) {
+    QString envVar = env.at(i);
+    if (envVar.startsWith("PATH="))
+      env.replace(i, envVar += ":/usr/sbin");
+  }
+#endif
+  tor.setEnvironment(env);
+
   /* Tor writes its state file even if all we're doing is --hash-password. So
    * if the user has configured a non-default data directory, then include
    * that in the list of command line arguments. */