It compiles; ship it.

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 4cdfcaf28b54b543adba889b16f7e8457c35ac05..47c8ec234e164047149133273c31376b32317e99 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1283,12 +1283,6 @@ void ServerConfig::Complete(const std::string &filename, bool error)
                        x->second = NULL;
                        FileErrors++;
                }
-               else
-               {
-                       ServerInstance->Log(DEBUG,"Recursively follow conf %s", x->first.c_str());
-                       LoadConf(newconfig, x->first.c_str(), errstr, 0, x->second);
-                       StartDownloads();
-               }
                TotalDownloaded++;
        }
 
@@ -1297,7 +1291,7 @@ void ServerConfig::Complete(const std::string &filename, bool error)
 
 void ServerConfig::StartDownloads()
 {
-       ServerInstance->Log(DEBUG,"StartDownloads() size=%d", IncludedFiles.size());
+       ServerInstance->Log(DEBUG,"((((((((((((((((((((((((( StartDownloads() size=%d )))))))))))))))))))))))))))))))))))))", IncludedFiles.size());
 
        /* Reads all local files into the IncludedFiles map, then initiates sockets for the remote ones */
        for (std::map<std::string, std::istream*>::iterator x = IncludedFiles.begin(); x != IncludedFiles.end(); ++x)
@@ -1305,6 +1299,8 @@ void ServerConfig::StartDownloads()
                if (CompletedFiles.find(x->first) != CompletedFiles.end())
                        continue;
 
+               ServerInstance->Log(DEBUG,"StartDownloads File: %s", x->first.c_str());
+
                std::string file = x->first;
                if ((file[0] == '/') || (file.substr(0, 7) == "file://"))
                {