summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-03-21 20:22:26 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-03-21 20:22:26 +0000
commitcd8d817ac45a6a3db9faa20892b8a03f10caad1d (patch)
tree23ede619b9907c69cf881cefc7f8bb3bc3f73806 /src
parentab5858c141c5dfda2502a414271748a02470104d (diff)
Generate warning if m_services_account.so and m_cap.so are not loaded with m_sasl.so to log file. Tidy up debug output.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9153 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_sasl.cpp6
-rw-r--r--src/modules/m_spanningtree/main.cpp2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 91443ab4b..fda574fb2 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -28,10 +28,8 @@ class CommandAuthenticate : public Command
CmdResult Handle (const char* const* parameters, int pcnt, User *user)
{
- ServerInstance->Logs->Log("m_sasl", DEBUG,"AUTHENTICATE");
if (user->registered != REG_ALL)
{
- ServerInstance->Logs->Log("m_sasl", DEBUG,"Sending ENCAP for AUTHENTICATE");
/* Only allow AUTHENTICATE on unregistered clients */
std::deque<std::string> params;
params.push_back("*");
@@ -52,7 +50,6 @@ class CommandAuthenticate : public Command
class ModuleSASL : public Module
{
CommandAuthenticate* sasl;
-
public:
ModuleSASL(InspIRCd* Me)
@@ -63,6 +60,9 @@ class ModuleSASL : public Module
sasl = new CommandAuthenticate(ServerInstance, this);
ServerInstance->AddCommand(sasl);
+
+ if (!ServerInstance->Modules->Find("m_services_account.so") || !ServerInstance->Modules->Find("m_cap.so"))
+ ServerInstance->Logs->Log("m_sasl", DEFAULT, "WARNING: m_services_account.so and m_cap.so are not loaded! m_sasl.so will NOT function correctly until these two modules are loaded!");
}
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index e084944cd..27179ad49 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -889,8 +889,6 @@ void ModuleSpanningTree::OnEvent(Event* event)
if (params->size() < 2)
return;
- ServerInstance->Logs->Log("m_spanningtree", DEBUG, "ENCAP sending from spanningtree...");
-
Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", *params);
}
else if (event->GetEventID() == "send_metadata")