fix network mode auto bug

svn path=/trunk/boinc/; revision=8147
This commit is contained in:
David Anderson 2005-09-22 20:05:40 +00:00
parent fecb41fa9e
commit 05d9b46a60
2 changed files with 11 additions and 7 deletions

View File

@ -12005,4 +12005,12 @@ David 22 Sept 2005
the AUTO case
client/
gui_rpc_server_ops.C
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

View File

@ -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;