diff options
| author | rubidium42 <rubidium@openttd.org> | 2021-04-27 20:26:56 +0200 |
|---|---|---|
| committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-13 23:13:17 +0200 |
| commit | c73d64adf984036a99d6974b130eda65dfc18c6c (patch) | |
| tree | 05390f3269bf3279d51b290cde02cf17c395a626 /src/network/network_admin.cpp | |
| parent | f219354f891c45dcefad2dd0a2f1fd92b07e4ba5 (diff) | |
| download | openttd-c73d64adf984036a99d6974b130eda65dfc18c6c.tar.xz | |
Codechange: move passwords in settings to std::string
Diffstat (limited to 'src/network/network_admin.cpp')
| -rw-r--r-- | src/network/network_admin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/network_admin.cpp b/src/network/network_admin.cpp index 4e73aed0f..057ce32c0 100644 --- a/src/network/network_admin.cpp +++ b/src/network/network_admin.cpp @@ -84,7 +84,7 @@ ServerNetworkAdminSocketHandler::~ServerNetworkAdminSocketHandler() */ /* static */ bool ServerNetworkAdminSocketHandler::AllowConnection() { - bool accept = !StrEmpty(_settings_client.network.admin_password) && _network_admins_connected < MAX_ADMINS; + bool accept = !_settings_client.network.admin_password.empty() && _network_admins_connected < MAX_ADMINS; /* We can't go over the MAX_ADMINS limit here. However, if we accept * the connection, there has to be space in the pool. */ static_assert(NetworkAdminSocketPool::MAX_SIZE == MAX_ADMINS); @@ -667,8 +667,8 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::Receive_ADMIN_JOIN(Packet *p) char password[NETWORK_PASSWORD_LENGTH]; p->Recv_string(password, sizeof(password)); - if (StrEmpty(_settings_client.network.admin_password) || - strcmp(password, _settings_client.network.admin_password) != 0) { + if (_settings_client.network.admin_password.empty() || + _settings_client.network.admin_password.compare(password) != 0) { /* Password is invalid */ return this->SendError(NETWORK_ERROR_WRONG_PASSWORD); } |