*** empty log message ***

svn path=/trunk/boinc/; revision=5897

checkin_notes

@@ -27396,3 +27396,9 @@ Bruce 19 April 2005
             index.php
             problem_host.php
 
+David  19 April 2005
+	- BOINC manager: remote connection wasn't working because
+		it was using the wrong password variable.
+
+	clientgui/
+		MainDocument.cpp

clientgui/MainDocument.cpp

@@ -77,10 +77,12 @@ void* CNetworkConnection::Poll() {
         retval = m_pDocument->rpc.init_poll();
         if (!retval) {
             wxLogTrace(wxT("CNetworkConnection::Poll - init_poll() returned ERR_CONNECT, now authorizing..."));
-            retval = m_pDocument->rpc.authorize(strComputerPassword.c_str());
+            retval = m_pDocument->rpc.authorize(m_strNewComputerPassword.c_str());
             if (!retval) {
                 wxLogTrace(wxT("CNetworkConnection::Poll - Connection Success"));
-                SetStateSuccess(strComputer, strComputerPassword);
+                std::string host=m_strNewComputerName;
+                std::string pwd=m_strNewComputerPassword;
+                SetStateSuccess(host, pwd);
             } else if (ERR_AUTHENTICATOR == retval) {
                 wxLogTrace(wxT("CNetworkConnection::Poll - RPC Authorization - ERR_AUTHENTICATOR"));
                 SetStateErrorAuthentication();

lib/boinc_cmd.C

@@ -122,12 +122,14 @@ int main(int argc, char** argv) {
     if (argc < 2) usage();
     i = 1;
     if (!strcmp(argv[i], "--host")) {
-        hostname = argv[i+1];
-        i += 2;
+        if (++i == argc) usage();
+        hostname = argv[i];
+        i++;
     }
-    if (!strcmp(argv[i], "--passwd")) {
-        passwd = argv[i+1];
-        i += 2;
+    if ((i<argc)&& !strcmp(argv[i], "--passwd")) {
+        if (++i == argc) usage();
+        passwd = argv[i];
+        i++;
     }
 
     // change the following to debug GUI RPC's asynchronous connection mechanism

lib/gui_rpc_client.C

@@ -1073,7 +1073,10 @@ int RPC_CLIENT::authorize(const char* passwd) {
             found = true;
         }
     }
-    if (!found) return ERR_AUTHENTICATOR;
+    if (!found) {
+        fprintf(stderr, "Nonce not found\n");
+        return ERR_AUTHENTICATOR;
+    }
 
     sprintf(buf, "%s%s", nonce, passwd);
     md5_block((const unsigned char*)buf, strlen(buf), nonce_hash);