Changeset 2973

Timestamp:

08/16/08 11:30:13 (3 months ago)

Author:

borkdomenik

Message:

bugfix on HidServAuth? with more than one service!

Location:

vidalia/branches/hidden-services/src/vidalia/config

Files:

• servicepage.ui (modified) (1 diff)
• servicesettings.cpp (modified) (1 diff)

vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui

@@ -531 +531 @@
           <widget class="QToolButton" name="copyServiceAuthBtn" >
            <property name="toolTip" >
-            <string>Copy authorization data of selected service to clipboard</string>
+            <string>Copy onion-address of selected service to clipboard</string>
            </property>
            <property name="text" >

vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp

@@ -121 +121 @@
   QStringList serviceAuthdataList;
   QString torConfString;
+  QString *errmsg;
   if(list.size() > 0) {
+    bool first = true;
     foreach(ServiceAuthorizationData tempService, list) {
       serviceAuthdataList << tempService.toString();
       //HidServAuth <onion address> <cookie> <optional_comment>
-      torConfString.append(tempService.authdata());
-      torConfString.append(" "+tempService.identification());
-      torControl()->setConf("HidServAuth", torConfString);
-    }
+      torConfString.append("HidServAuth=");
+      torConfString.append(string_escape(tempService.authdata()+" "+tempService.identification()));
+      torConfString.append(" ");
+    }
+    torConfString.remove(torConfString.length()-1, 1);
+    torControl()->setConf(torConfString, errmsg);
   }
   setValue(SETTING_TOR_CONSUMED_SERVICES, serviceAuthdataList);