m_filter Fix memory leak on unload

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

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 551156732dc9838cdd81e7b1fc7631d94e864110..a234c02c66bd89a5abd6479d84caaae0af46b455 100644 (file)
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -210,7 +210,10 @@ class CommandRLine : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               return ROUTE_LOCALONLY;
+               if (IS_LOCAL(user))
+                       return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
+
+               return ROUTE_BROADCAST;
        }
 };
 
@@ -231,11 +234,11 @@ class ModuleRLine : public Module
        {
                OnRehash(NULL);
 
-               ServerInstance->AddCommand(&r);
+               ServerInstance->Modules->AddService(r);
                ServerInstance->XLines->RegisterFactory(&f);
 
                Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnStats, I_OnBackgroundTimer };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleRLine()
@@ -263,11 +266,11 @@ class ModuleRLine : public Module
 
        virtual void OnRehash(User *user)
        {
-               ConfigReader Conf;
+               ConfigTag* tag = ServerInstance->Config->ConfValue("rline");
 
-               MatchOnNickChange = Conf.ReadFlag("rline", "matchonnickchange", 0);
-               ZlineOnMatch = Conf.ReadFlag("rline", "zlineonmatch", 0);
-               std::string newrxengine = Conf.ReadValue("rline", "engine", 0);
+               MatchOnNickChange = tag->getBool("matchonnickchange");
+               ZlineOnMatch = tag->getBool("zlineonmatch");
+               std::string newrxengine = tag->getString("engine");
 
                if (newrxengine.empty())
                        rxfactory.SetProvider("regex");