Add SHUN as a /filter action

[user/henk/code/inspircd.git] / src / modules / m_sasl.cpp

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index d5cf94c0c507ffd889c0c0691a4e51f37fe9e2b9..2fc0725a98a4e1007fa7bef2d499d370b0c74844 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,7 +23,7 @@
 #include "modules/account.h"
 #include "modules/sasl.h"
 #include "modules/ssl.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 enum
 {
@@ -37,7 +37,7 @@ enum
 
 static std::string sasl_target;
 
-class ServerTracker : public SpanningTreeEventListener
+class ServerTracker : public ServerEventListener
 {
        bool online;
 
@@ -65,7 +65,7 @@ class ServerTracker : public SpanningTreeEventListener
 
  public:
        ServerTracker(Module* mod)
-               : SpanningTreeEventListener(mod)
+               : ServerEventListener(mod)
        {
                Reset();
        }
@@ -398,7 +398,11 @@ class ModuleSASL : public Module
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               sasl_target = ServerInstance->Config->ConfValue("sasl")->getString("target", "*");
+               std::string target = ServerInstance->Config->ConfValue("sasl")->getString("target");
+               if (target.empty())
+                       throw ModuleException("<sasl:target> must be set to the name of your services server!");
+
+               sasl_target = target;
                servertracker.Reset();
        }