gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r9061) -Fix [r9038, FS#668]: passwords are send when the server is in the 'authorizing' state, not 'inactive'.

Browse Source
This commit is contained in:
rubidium 2007-03-08 09:46:44 +00:00
parent 2536a14abd
commit c89379f7eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/network_server.cpp
View File

@ -697,7 +697,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_PASSWORD)
type = (NetworkPasswordType)p->Recv_uint8(); type = (NetworkPasswordType)p->Recv_uint8();
p->Recv_string(password, sizeof(password)); p->Recv_string(password, sizeof(password));
if (cs->status == STATUS_INACTIVE && type == NETWORK_GAME_PASSWORD) { if (cs->status == STATUS_AUTHORIZING && type == NETWORK_GAME_PASSWORD) {
// Check game-password // Check game-password
if (strcmp(password, _network_game_info.server_password) != 0) { if (strcmp(password, _network_game_info.server_password) != 0) {
// Password is invalid // Password is invalid
@ -715,7 +715,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_PASSWORD)
// Valid password, allow user // Valid password, allow user
SEND_COMMAND(PACKET_SERVER_WELCOME)(cs); SEND_COMMAND(PACKET_SERVER_WELCOME)(cs);
return; return;
} else if (cs->status == STATUS_INACTIVE && type == NETWORK_COMPANY_PASSWORD) { } else if (cs->status == STATUS_AUTHORIZING && type == NETWORK_COMPANY_PASSWORD) {
ci = DEREF_CLIENT_INFO(cs); ci = DEREF_CLIENT_INFO(cs);
if (strcmp(password, _network_player_info[ci->client_playas].password) != 0) { if (strcmp(password, _network_player_info[ci->client_playas].password) != 0) {