Skip to content

Commit ad58ece

Browse files
committedNov 12, 2020
serverpackethandler: Minor log message fixes
closes #10434
1 parent 61bbdd6 commit ad58ece

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed
 

‎src/network/serverpackethandler.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -1657,19 +1657,18 @@ void Server::handleCommand_SrpBytesM(NetworkPacket* pkt)
16571657

16581658
bool wantSudo = (cstate == CS_Active);
16591659

1660-
verbosestream << "Server: Received TOCLIENT_SRP_BYTES_M." << std::endl;
1660+
verbosestream << "Server: Received TOSERVER_SRP_BYTES_M." << std::endl;
16611661

16621662
if (!((cstate == CS_HelloSent) || (cstate == CS_Active))) {
1663-
actionstream << "Server: got SRP _M packet in wrong state "
1664-
<< cstate << " from " << addr_s
1665-
<< ". Ignoring." << std::endl;
1663+
warningstream << "Server: got SRP_M packet in wrong state "
1664+
<< cstate << " from " << addr_s << ". Ignoring." << std::endl;
16661665
return;
16671666
}
16681667

16691668
if (client->chosen_mech != AUTH_MECHANISM_SRP &&
16701669
client->chosen_mech != AUTH_MECHANISM_LEGACY_PASSWORD) {
1671-
actionstream << "Server: got SRP _M packet, while auth"
1672-
<< "is going on with mech " << client->chosen_mech << " from "
1670+
warningstream << "Server: got SRP_M packet, while auth "
1671+
"is going on with mech " << client->chosen_mech << " from "
16731672
<< addr_s << " (wantSudo=" << wantSudo << "). Denying." << std::endl;
16741673
if (wantSudo) {
16751674
DenySudoAccess(peer_id);
@@ -1717,7 +1716,7 @@ void Server::handleCommand_SrpBytesM(NetworkPacket* pkt)
17171716

17181717
std::string checkpwd; // not used, but needed for passing something
17191718
if (!m_script->getAuth(playername, &checkpwd, NULL)) {
1720-
actionstream << "Server: " << playername <<
1719+
errorstream << "Server: " << playername <<
17211720
" cannot be authenticated (auth handler does not work?)" <<
17221721
std::endl;
17231722
DenyAccess(peer_id, SERVER_ACCESSDENIED_SERVER_FAIL);

0 commit comments

Comments
 (0)
Please sign in to comment.