From 33baaccab7a06b94a8efb195088998eeca168e26 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 19 Apr 2005 20:53:04 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=5897
---
 checkin_notes              |  6 ++++++
 clientgui/MainDocument.cpp |  6 ++++--
 lib/boinc_cmd.C            | 12 +++++++-----
 lib/gui_rpc_client.C       |  5 ++++-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 0d4f45975d..151e9e4b83 100755
--- a/checkin_notes
+++ b/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
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index cb920e457b..ced75175c2 100644
--- a/clientgui/MainDocument.cpp
+++ b/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();
diff --git a/lib/boinc_cmd.C b/lib/boinc_cmd.C
index 79495ed202..fa952f2829 100644
--- a/lib/boinc_cmd.C
+++ b/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
diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C
index 0a8e2a3e75..5751257f9e 100644
--- a/lib/gui_rpc_client.C
+++ b/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);