Delink servers using an SSL module that is being reloaded

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 183e78a12f9137995c8424b8fa5581b5aea4e8cc..9db1f2665499d4828026f50305321c7cbbbd4606 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -361,8 +361,6 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 
                        me->name = name;
 
-                       tag->readString("password", me->pass);
-                       tag->readString("hash", me->hash);
                        me->registration_timeout = tag->getInt("timeout", me->registration_timeout);
                        me->pingtime = tag->getInt("pingfreq", me->pingtime);
                        std::string sendq;
@@ -384,7 +382,6 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
                        me->fakelag = tag->getBool("fakelag", me->fakelag);
                        me->maxlocal = tag->getInt("localmax", me->maxlocal);
                        me->maxglobal = tag->getInt("globalmax", me->maxglobal);
-                       me->port = tag->getInt("port", me->port);
                        me->maxchans = tag->getInt("maxchans", me->maxchans);
                        me->limit = tag->getInt("limit", me->limit);
 
@@ -591,8 +588,6 @@ void ServerConfig::Read()
        }
        if (valid)
        {
-               ReadFile(MOTD, ConfValue("files")->getString("motd"));
-               ReadFile(RULES, ConfValue("files")->getString("rules"));
                DNSServer = ConfValue("dns")->getString("server");
                FindDNS(DNSServer);
        }
@@ -795,34 +790,6 @@ ConfigTagList ServerConfig::ConfTags(const std::string& tag)
        return config_data.equal_range(tag);
 }
 
-/** Read the contents of a file located by `fname' into a file_cache pointed at by `F'.
- */
-bool ServerConfig::ReadFile(file_cache &F, const std::string& fname)
-{
-       if (fname.empty())
-               return false;
-
-       char linebuf[MAXBUF];
-
-       F.clear();
-
-       FileWrapper file(fopen(fname.c_str(), "r"));
-
-       if (!file)
-               return false;
-       while (!feof(file))
-       {
-               if (fgets(linebuf, sizeof(linebuf), file))
-                       linebuf[strlen(linebuf)-1] = 0;
-               else
-                       *linebuf = 0;
-
-               F.push_back(*linebuf ? linebuf : " ");
-       }
-
-       return true;
-}
-
 bool ServerConfig::FileExists(const char* file)
 {
        struct stat sb;