diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/inspircd.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_cloaking.cpp | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 0de94a316..35036afe9 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -382,17 +382,23 @@ void InspIRCd::WritePID(const std::string &filename) InspIRCd::InspIRCd(int argc, char** argv) : ModCount(0), GlobalCulls(this), + + /* Functor initialisation. Note that the ordering here is very important. */ HandleProcessUser(this), HandleIsNick(this), HandleIsIdent(this), HandleFindDescriptor(this), HandleFloodQuitUser(this), + + /* Functor pointer initialisation. Must match the order of the list above */ ProcessUser(&HandleProcessUser), IsNick(&HandleIsNick), IsIdent(&HandleIsIdent), FindDescriptor(&HandleFindDescriptor), FloodQuitUser(&HandleFloodQuitUser) + { + int found_ports = 0; FailedPortList pl; int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0; /* flag variables */ diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 4ef903392..ff9fdc683 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -254,7 +254,19 @@ class CloakUser : public ModeHandler prefix = ServerInstance->Config->Network; if (!key1 || !key2 || !key3 || !key4) - throw ModuleException("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED!"); + { + std::string detail; + if (!key1) + detail = "<cloak:key1> is not valid, it may be set to a too high/low value, or it may not exist."; + else if (!key2) + detail = "<cloak:key2> is not valid, it may be set to a too high/low value, or it may not exist."; + else if (!key3) + detail = "<cloak:key3> is not valid, it may be set to a too high/low value, or it may not exist."; + else if (!key4) + detail = "<cloak:key4> is not valid, it may be set to a too high/low value, or it may not exist."; + + throw ModuleException("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED! - " + detail); + } } }; |