Fix infinite loop on alias expansion, found by Adam

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

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 594f1dd061d9b53e9b3e9afa0cd3589465f96cac..ef834e55ac7e36bab1feeac71c0f126bb255b191 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -42,9 +42,8 @@ class ModuleConnJoin : public Module
                }
 
        public:
-               ModuleConnJoin(InspIRCd* Me)
-                       : Module(Me)
-               {
+               ModuleConnJoin()
+                                       {
                        OnRehash(NULL);
                        Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
                        ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -58,12 +57,11 @@ class ModuleConnJoin : public Module
 
                virtual void OnRehash(User* user)
                {
-                       ConfigReader* conf = new ConfigReader(ServerInstance);
-                       JoinChan = conf->ReadValue("autojoin", "channel", 0);
+                       ConfigReader conf;
+                       JoinChan = conf.ReadValue("autojoin", "channel", 0);
                        Joinchans.clear();
                        if (!JoinChan.empty())
                                tokenize(JoinChan,Joinchans);
-                       delete conf;
                }
 
                virtual ~ModuleConnJoin()
@@ -72,7 +70,7 @@ class ModuleConnJoin : public Module
 
                virtual Version GetVersion()
                {
-                       return Version("$Id$", VF_VENDOR,API_VERSION);
+                       return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
                }
 
                virtual void OnPostConnect(User* user)
@@ -82,7 +80,7 @@ class ModuleConnJoin : public Module
 
                        for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
                                if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
-                                       Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time());
+                                       Channel::JoinUser(user, it->c_str(), false, "", false, ServerInstance->Time());
                }
 
 };