From f17f81604157e9d012f89e3bc3f708dcb0c06aa3 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sun, 9 Oct 2011 06:01:30 +0000
Subject: [PATCH] - client: fix bugs in acct manager attach/detach

svn path=/trunk/boinc/; revision=24358
---
 checkin_notes                 | 6 ++++++
 client/gui_rpc_server_ops.cpp | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 831cf697b4..d94a2743b1 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7014,3 +7014,9 @@ David  8 Oct 2011
 
     api/
         boinc_api.cpp
+
+David  8 Oct 2011
+	- client: fix bugs in acct manager attach/detach
+
+	client/
+		gui_rpc_server_ops.cpp
diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index cc3a4da2c5..47b9d0b1d4 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -872,7 +872,7 @@ static void handle_acct_mgr_rpc(GUI_RPC_CONN& grc) {
         if (grc.xp.parse_string("password", password)) continue;
         if (grc.xp.parse_bool("use_config_file", use_config_file)) continue;
     }
-    if (use_config_file) {
+    if (!use_config_file) {
         bad_arg = url.empty() || name.empty() || password.empty();
         if (!bad_arg) {
             name_lc = name;
@@ -899,7 +899,7 @@ static void handle_acct_mgr_rpc(GUI_RPC_CONN& grc) {
     if (bad_arg) {
         grc.mfout.printf("<error>bad arg</error>\n");
     } else {
-        gstate.acct_mgr_info.next_rpc_time = gstate.now;
+        gstate.acct_mgr_op.do_rpc(url, name, password_hash, true);
         grc.mfout.printf("<success/>\n");
     }
 }