diff options
| author |  Sadie Powell | 2022-05-31 14:33:00 +0100 |
|---|---|---|
| committer | Sadie Powell | 2022-05-31 14:33:00 +0100 |
| commit | 6c8d8a79946c062ae9022c38ca2555ebe0a52356 (patch) | |
| tree | 4398005fd1bbf07f6b0d178d6d683ee23ed11c60 /src/usermanager.cpp | |
| parent | Fix some warnings that were missed during the merge. (diff) | |
| parent | Make it more obvious when an I/O hook is misconfigured. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/usermanager.cpp')
| -rw-r--r-- | src/usermanager.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 83a0abd87..969106290 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -146,16 +146,14 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs ListenSocket::IOHookProvRef& iohookprovref = *i; if (!iohookprovref) { - if (!iohookprovref.GetProvider().empty()) - { - ServerInstance->Logs.Debug("USERS", "Non-existent I/O hook '%s' in <bind:%s> tag at %s", - iohookprovref.GetProvider().c_str(), - i == via->iohookprovs.begin() ? "hook" : "sslprofile", - via->bind_tag->source.str().c_str()); - this->QuitUser(New, "Internal error handling connection"); - return; - } - continue; + if (iohookprovref.GetProvider().empty()) + continue; + + const char* hooktype = i == via->iohookprovs.begin() ? "hook" : "sslprofile"; + ServerInstance->Logs.Normal("USERS", "Non-existent I/O hook '%s' in <bind:%s> tag at %s", + iohookprovref.GetProvider().c_str(), hooktype, via->bind_tag->source.str().c_str()); + this->QuitUser(New, InspIRCd::Format("Internal error handling connection (misconfigured %s)", hooktype)); + return; } iohookprovref->OnAccept(eh, client, server); |