auto-set +s when +n is set (as +n requires +s) - allow +n to be 'set twice' allowing...

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 99b6fecf913a59a61d105005b34b2104e5d03d7e..0a1150aa8932e51abdf4b45075fa8f5997ca886e 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -32,7 +32,7 @@ using namespace std;
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "typedefs.h"
 #include "configreader.h"
@@ -73,7 +73,7 @@ bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* ipmask = (char*)values[1];
        
        conf->GetInstance()->XLines->add_zline(0,"<Config>",reason,ipmask);
-       log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
+       conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
        return true;
 }
 
@@ -83,7 +83,7 @@ bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* nick = (char*)values[1];
        
        conf->GetInstance()->XLines->add_qline(0,"<Config>",reason,nick);
-       log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
+       conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
        return true;
 }
 
@@ -93,7 +93,7 @@ bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* host = (char*)values[1];
        
        conf->GetInstance()->XLines->add_kline(0,"<Config>",reason,host);
-       log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
+       conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
        return true;
 }
 
@@ -103,7 +103,7 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* host = (char*)values[1];
        
        conf->GetInstance()->XLines->add_eline(0,"<Config>",reason,host);
-       log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
+       conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
        return true;
 }