# HG changeset patch
# User smatz <smatz@openttd.org>
# Date 1271006591 0
# Node ID 9e5144f34303d449181edd5501aa757726389c70
# Parent  807715f421a87391e252e1b787e91704b84314d1
(svn r19608) -Fix: do not kick client if he entered password and the password was cleared meanwhile

diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -754,8 +754,9 @@
 	char password[NETWORK_PASSWORD_LENGTH];
 	p->Recv_string(password, sizeof(password));
 
-	/* Check game password */
-	if (strcmp(password, _settings_client.network.server_password) != 0) {
+	/* Check game password. Allow joining if we cleared the password meanwhile */
+	if (!StrEmpty(_settings_client.network.server_password) &&
+			strcmp(password, _settings_client.network.server_password) != 0) {
 		/* Password is invalid */
 		return SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD);
 	}
@@ -778,9 +779,10 @@
 	char password[NETWORK_PASSWORD_LENGTH];
 	p->Recv_string(password, sizeof(password));
 
-	/* Check company password */
+	/* Check company password. Allow joining if we cleared the password meanwhile */
 	const NetworkClientInfo *ci = cs->GetInfo();
-	if (strcmp(password, _network_company_states[ci->client_playas].password) != 0) {
+	if (!StrEmpty(_network_company_states[ci->client_playas].password) &&
+			strcmp(password, _network_company_states[ci->client_playas].password) != 0) {
 		/* Password is invalid */
 		return SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD);
 	}