From 05d9b46a607dfdbdcff3af31d6b61813cb7cc63d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 22 Sep 2005 20:05:40 +0000 Subject: [PATCH] fix network mode auto bug svn path=/trunk/boinc/; revision=8147 --- checkin_notes | 10 +++++++++- client/scheduler_op.C | 8 ++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/checkin_notes b/checkin_notes index bd92a9cd6a..6bf91ea97b 100755 --- a/checkin_notes +++ b/checkin_notes @@ -12005,4 +12005,12 @@ David 22 Sept 2005 the AUTO case client/ - gui_rpc_server_ops.C \ No newline at end of file + gui_rpc_server_ops.C + +David 22 Sept 2005 + - we were assuming that if a scheduler RPC reply didn't + have a user ID, it must be because of a bad account key. + Not so - could also be major version mismatch with old schedulers + + client/ + scheduler_op.C diff --git a/client/scheduler_op.C b/client/scheduler_op.C index 53c8e6cec4..535fb9f4af 100644 --- a/client/scheduler_op.C +++ b/client/scheduler_op.C @@ -63,7 +63,7 @@ bool SCHEDULER_OP::check_master_fetch_start() { "Couldn't start master page download: %s", boincerror(retval) ); if (p->tentative) { - p->attach_failed(ERR_ATTACH_FAIL_INIT); + p->attach_failed(0); } else { p->master_fetch_failures++; backoff(p, "Master page fetch failed\n"); @@ -487,13 +487,9 @@ bool SCHEDULER_OP::poll() { ); } retval = gstate.handle_scheduler_reply(cur_proj, scheduler_url, nresults); - - // if this was a tentative project and we didn't get user name, - // the account ID must be bad. Tell the user. - // if (cur_proj->tentative) { if (retval || strlen(cur_proj->user_name)==0) { - cur_proj->attach_failed(ERR_ATTACH_FAIL_BAD_KEY); + cur_proj->attach_failed(0); } else { cur_proj->tentative = false; gstate.have_tentative_project = false;