summaryrefslogtreecommitdiff
path: root/src/inspircd.cpp
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-29 15:54:21 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-29 15:54:21 +0000
commit092c202a5e64852d38b3157c0d8c7b51b866a7f2 (patch)
tree238c8b9c38549fe88c68c166f911bd753b501bd5 /src/inspircd.cpp
parentef70e0ac9cd103adcfc1b879c0a6c946fd53413b (diff)
Added include stack to detect looped includes
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1553 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/inspircd.cpp')
-rw-r--r--src/inspircd.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 9dc99857b..37c98bb1b 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -120,6 +120,7 @@ int ep, lep, sep;
#endif
bool has_been_netsplit = false;
+extern std::vector<std::string> include_stack;
typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
@@ -263,6 +264,7 @@ void ReadConfig(bool bail, userrec* user)
char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF];
ConnectClass c;
std::stringstream errstr;
+ include_stack.clear();
if (!LoadConf(CONFIG_FILE,&config_f,&errstr))
{