Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=2857
This commit is contained in:
David Anderson 2004-01-08 00:40:53 +00:00
parent a68fc8c6da
commit 9d79e148d5
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -9015,3 +9015,11 @@ David 7 Jan 2004
sched/ sched/
handle_request.C handle_request.C
server_types.C,h server_types.C,h
David 7 Jan 2004
- scheduling server: if get invalid hostid,
look up user before creating new host
(otherwise will create a host record with userid 0)
sched/
handle_request.C

10
sched/handle_request.C
View File

@ -290,12 +290,14 @@ int authenticate_user(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
sreq.hostid sreq.hostid
); );
sreq.hostid = 0; sreq.hostid = 0;
goto new_host; goto lookup_user_and_make_new_host;
} }
reply.host = host; reply.host = host;
retval = user.lookup_id(reply.host.userid); retval = user.lookup_id(reply.host.userid);
if (retval) { if (retval) {
// this should never happen - means inconsistent DB
//
strcpy(reply.message, "Can't find user record"); strcpy(reply.message, "Can't find user record");
strcpy(reply.message_priority, "low"); strcpy(reply.message_priority, "low");
reply.request_delay = 120; reply.request_delay = 120;
@ -334,12 +336,14 @@ int authenticate_user(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
"[HOST#%d] [USER#%d] RPC seqno %d less than expected %d; creating new host\n", "[HOST#%d] [USER#%d] RPC seqno %d less than expected %d; creating new host\n",
reply.host.id, user.id, sreq.rpc_seqno, reply.host.rpc_seqno reply.host.id, user.id, sreq.rpc_seqno, reply.host.rpc_seqno
); );
goto new_host; goto make_new_host;
} }
reply.host.rpc_seqno = sreq.rpc_seqno; reply.host.rpc_seqno = sreq.rpc_seqno;
} else { } else {
// here no hostid was given; we'll have to create a new host record // here no hostid was given; we'll have to create a new host record
// //
lookup_user_and_make_new_host:
strncpy( strncpy(
user.authenticator, sreq.authenticator, user.authenticator, sreq.authenticator,
sizeof(user.authenticator) sizeof(user.authenticator)
@ -361,7 +365,7 @@ int authenticate_user(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
return ERR_AUTHENTICATOR; return ERR_AUTHENTICATOR;
} }
reply.user = user; reply.user = user;
new_host: make_new_host:
// reply.user is filled in and valid at this point // reply.user is filled in and valid at this point
// //
host = sreq.host; host = sreq.host;