Added config_f to serverconfig, UNTESTED

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2402 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 14 insertions, 13 deletions

diff --git a/src/xline.cpp b/src/xline.cpp
index 32d35dace..d08383f8c 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -48,11 +48,12 @@ using namespace std;
 #include "hashcomp.h"
 #include "typedefs.h"
 
+extern ServerConfig *Config;
+
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern ServerConfig* Config;
-extern std::stringstream config_f;
 extern user_hash clientlist;
 
 /* Version two, now with optimized expiry!
@@ -112,33 +113,33 @@ void read_xline_defaults()
 	char host[MAXBUF];
 	char reason[MAXBUF];
 
-	for (int i = 0; i < ConfValueEnum("badip",&config_f); i++)
+	for (int i = 0; i < ConfValueEnum("badip",&Config->config_f); i++)
 	{
-		ConfValue("badip","ipmask",i,ipmask,&config_f);
-		ConfValue("badip","reason",i,reason,&config_f);
+		ConfValue("badip","ipmask",i,ipmask,&Config->config_f);
+		ConfValue("badip","reason",i,reason,&Config->config_f);
 		add_zline(0,"<Config>",reason,ipmask);
 		log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
 	}
 	
-	for (int i = 0; i < ConfValueEnum("badnick",&config_f); i++)
+	for (int i = 0; i < ConfValueEnum("badnick",&Config->config_f); i++)
 	{
-		ConfValue("badnick","nick",i,nick,&config_f);
-		ConfValue("badnick","reason",i,reason,&config_f);
+		ConfValue("badnick","nick",i,nick,&Config->config_f);
+		ConfValue("badnick","reason",i,reason,&Config->config_f);
 		add_qline(0,"<Config>",reason,nick);
 		log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
 	}
 	
-	for (int i = 0; i < ConfValueEnum("badhost",&config_f); i++)
+	for (int i = 0; i < ConfValueEnum("badhost",&Config->config_f); i++)
 	{
-		ConfValue("badhost","host",i,host,&config_f);
-		ConfValue("badhost","reason",i,reason,&config_f);
+		ConfValue("badhost","host",i,host,&Config->config_f);
+		ConfValue("badhost","reason",i,reason,&Config->config_f);
 		add_kline(0,"<Config>",reason,host);
 		log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
 	}
-	for (int i = 0; i < ConfValueEnum("exception",&config_f); i++)
+	for (int i = 0; i < ConfValueEnum("exception",&Config->config_f); i++)
 	{
-		ConfValue("exception","host",i,host,&config_f);
-		ConfValue("exception","reason",i,reason,&config_f);
+		ConfValue("exception","host",i,host,&Config->config_f);
+		ConfValue("exception","reason",i,reason,&Config->config_f);
 		add_eline(0,"<Config>",reason,host);
 		log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
 	}