Dont propogate K-lines

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index f671c9545f1069e63904ce591a9bd56e73e5124c..f62e2a74bf2fb618cc2407fe40ea8d6be3dd01a7 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -324,7 +324,14 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->uuidlist = new user_hash();
        this->chanlist = new chan_hash();
 
+
        this->Config = new ServerConfig(this);
+       this->SNO = new SnomaskManager(this);
+       this->Modules = new ModuleManager(this);
+       this->stats = new serverstats();
+       this->Timers = new TimerManager(this);
+       this->Parser = new CommandParser(this);
+       this->XLines = new XLineManager(this);
 
        this->Config->argv = argv;
        this->Config->argc = argc;
@@ -337,7 +344,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        this->Config->opertypes.clear();
        this->Config->operclass.clear();
-       this->SNO = new SnomaskManager(this);
+
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
        this->time_delta = 0;
        srand(this->TIME);
@@ -425,19 +432,12 @@ InspIRCd::InspIRCd(int argc, char** argv)
        /* Set the finished argument values */
        Config->nofork = do_nofork;
        Config->forcedebug = do_debug;
-       Config->writelog = !do_nolog;
-
-       this->Modules = new ModuleManager(this);
-       this->stats = new serverstats();
-       this->Timers = new TimerManager(this);
-       this->Parser = new CommandParser(this);
-       this->XLines = new XLineManager(this);
-       
+       Config->writelog = !do_nolog;   
        Config->ClearStack();
        Config->Read(true, NULL);
 
        // Get XLine to do it's thing.
-       this->XLines->CheckELines(this->XLines->lookup_lines['E']);
+       this->XLines->CheckELines();
        this->XLines->ApplyLines();
        
        this->Modules->modules.resize(255);
@@ -635,7 +635,6 @@ int InspIRCd::Run()
 
                        if ((TIME % 5) == 0)
                        {
-                               XLines->expire_lines();
                                FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
                                Timers->TickMissedTimers(TIME);
                        }