]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/configreader.cpp
Add <connect:maxchans> as per feature bug #338 - combined with the last feature,...
[user/henk/code/inspircd.git] / src / configreader.cpp
index 9d920dc8cdee93e23ea476668f7e5f327ef7650c..b3258eb2ee1702d1532a1b53f56583a26301a2d3 100644 (file)
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include <sstream>
 #include <fstream>
-#include "inspircd.h"
 #include "xline.h"
 #include "exitcodes.h"
 #include "commands/cmd_whowas.h"
 
 std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
 
+/* Needs forward declaration */
+bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data);
+
 ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 {
        this->ClearStack();
        *ServerName = *Network = *ServerDesc = *AdminName = '\0';
-       *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
-       *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
-       *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
+       *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = *HideKillsServer = '\0';
+       *DefaultModes = *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
+       *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0';
        WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
        log_file = NULL;
        NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false;
@@ -37,12 +40,13 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
        NetBufferSize = 10240;
        SoftLimit = MAXCLIENTS;
        MaxConn = SOMAXCONN;
-       MaxWhoResults = 100;
+       MaxWhoResults = 0;
        debugging = 0;
        MaxChans = 20;
        OperMaxChans = 30;
        LogLevel = DEFAULT;
        maxbans.clear();
+       DNSServerValidator = &ValidateDnsServer;
 }
 
 void ServerConfig::ClearStack()
@@ -129,7 +133,7 @@ void ServerConfig::Update005()
                        char buf[MAXBUF];
                        snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
                        isupport.push_back(buf);
-                       line5 = "";
+                       line5.clear();
                        token_counter = 0;
                }
        }
@@ -202,13 +206,13 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance)
        std::string thiscmd;
 
        /* Enable everything first */
-       for (nspace::hash_map<std::string,command_t*>::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
+       for (command_table::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
                x->second->Disable(false);
 
        /* Now disable all the ones which the user wants disabled */
        while (dcmds >> thiscmd)
        {
-               nspace::hash_map<std::string,command_t*>::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
+               command_table::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
                if (cm != ServerInstance->Parser->cmdlist.end())
                {
                        cm->second->Disable(true);
@@ -221,10 +225,10 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, V
 {
        if (!*(data.GetString()))
        {
+               std::string nameserver;
                // attempt to look up their nameserver from /etc/resolv.conf
                conf->GetInstance()->Log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
                ifstream resolv("/etc/resolv.conf");
-               std::string nameserver;
                bool found_server = false;
 
                if (resolv.is_open())
@@ -285,9 +289,9 @@ bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* valu
 
 bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-       if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1))
+       if ((data.GetInteger() > 65535) || (data.GetInteger() < 1))
        {
-               conf->GetInstance()->Log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
+               conf->GetInstance()->Log(DEFAULT,"<options:maxwhoresults> size out of range, setting to default of 128.");
                data.Set(128);
        }
        return true;
@@ -320,12 +324,35 @@ bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, ValueI
        return true;
 }
 
+bool ValidateNotEmpty(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+{
+       if (!*data.GetString())
+               throw CoreException(std::string("The value for ")+tag+" cannot be empty!");
+       return true;
+}
+
 bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
        conf->ReadFile(conf->RULES, data.GetString());
        return true;
 }
 
+bool ValidateModeLists(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+{
+       memset(conf->HideModeLists, 0, 256);
+       for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
+               conf->HideModeLists[*x] = true;
+       return true;
+}
+
+bool ValidateExemptChanOps(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+{
+       memset(conf->ExemptChanOps, 0, 256);
+       for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
+               conf->ExemptChanOps[*x] = true;
+       return true;
+}
+
 bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
        conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString());
@@ -377,16 +404,41 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v
        int recvq = values[8].GetInteger();
        int localmax = values[9].GetInteger();
        int globalmax = values[10].GetInteger();
+       int port = values[11].GetInteger();
+       const char* name = values[12].GetString();
+       const char* parent = values[13].GetString();
+       int maxchans = values[14].GetInteger();
 
-       if (*allow)
+       if (*parent)
        {
-               ConnectClass c(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax);
-               conf->Classes.push_back(c);
+               /* Find 'parent' and inherit a new class from it,
+                * then overwrite any values that are set here
+                */
+               for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
+               {
+                       if (item->GetName() == name)
+                       {
+                               ConnectClass c(name, *item);
+                               c.Update(timeout, flood, std::string(*allow ? allow : deny), pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port);
+                               conf->Classes.push_back(c);
+                       }
+               }
+               throw CoreException("Class name '" + std::string(name) + "' is configured to inherit from class '" + std::string(name) + "' which cannot be found.");
        }
        else
        {
-               ConnectClass c(deny);
-               conf->Classes.push_back(c);
+               if (*allow)
+               {
+                       ConnectClass c(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans);
+                       c.SetPort(port);
+                       conf->Classes.push_back(c);
+               }
+               else
+               {
+                       ConnectClass c(name, deny);
+                       c.SetPort(port);
+                       conf->Classes.push_back(c);
+               }
        }
 
        return true;
@@ -412,7 +464,8 @@ bool InitULine(ServerConfig* conf, const char* tag)
 bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
 {
        const char* server = values[0].GetString();
-       conf->ulines.push_back(server);
+       const bool silent = values[1].GetBool();
+       conf->ulines[server] = silent;
        return true;
 }
 
@@ -514,7 +567,7 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail,
        {
                /* Unneeded because of the ServerInstance->Log() aboive? */
                printf("There were errors in your configuration:\n%s\n\n",errormessage.c_str());
-               InspIRCd::Exit(EXIT_STATUS_CONFIG);
+               ServerInstance->Exit(EXIT_STATUS_CONFIG);
        }
        else
        {
@@ -550,6 +603,8 @@ void ServerConfig::Read(bool bail, userrec* user)
 {
        static char debug[MAXBUF];      /* Temporary buffer for debugging value */
        static char maxkeep[MAXBUF];    /* Temporary buffer for WhoWasMaxKeep value */
+       static char hidemodes[MAXBUF];  /* Modes to not allow listing from users below halfop */
+       static char exemptchanops[MAXBUF];      /* Exempt channel ops from these modes */
        int rem = 0, add = 0;           /* Number of modules added, number of modules removed */
        std::ostringstream errstr;      /* String stream containing the error output */
 
@@ -560,6 +615,7 @@ void ServerConfig::Read(bool bail, userrec* user)
        InitialConfig Values[] = {
                {"options",     "softlimit",    MAXCLIENTS_S,           new ValueContainerUInt (&this->SoftLimit),              DT_INTEGER, ValidateSoftLimit},
                {"options",     "somaxconn",    SOMAXCONN_S,            new ValueContainerInt  (&this->MaxConn),                DT_INTEGER, ValidateMaxConn},
+               {"options",     "moronbanner",  "Youre banned!",        new ValueContainerChar (this->MoronBanner),             DT_CHARPTR, NoValidation},
                {"server",      "name",         "",                     new ValueContainerChar (this->ServerName),              DT_CHARPTR, ValidateServerName},
                {"server",      "description",  "Configure Me",         new ValueContainerChar (this->ServerDesc),              DT_CHARPTR, NoValidation},
                {"server",      "network",      "Network",              new ValueContainerChar (this->Network),                 DT_CHARPTR, NoValidation},
@@ -568,15 +624,17 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"admin",       "nick",         "Misconfigured",        new ValueContainerChar (this->AdminNick),               DT_CHARPTR, NoValidation},
                {"files",       "motd",         "",                     new ValueContainerChar (this->motd),                    DT_CHARPTR, ValidateMotd},
                {"files",       "rules",        "",                     new ValueContainerChar (this->rules),                   DT_CHARPTR, ValidateRules},
-               {"power",       "diepass",      "",                     new ValueContainerChar (this->diepass),                 DT_CHARPTR, NoValidation},
+               {"power",       "diepass",      "",                     new ValueContainerChar (this->diepass),                 DT_CHARPTR, ValidateNotEmpty},
                {"power",       "pause",        "",                     new ValueContainerInt  (&this->DieDelay),               DT_INTEGER, NoValidation},
-               {"power",       "restartpass",  "",                     new ValueContainerChar (this->restartpass),             DT_CHARPTR, NoValidation},
+               {"power",       "restartpass",  "",                     new ValueContainerChar (this->restartpass),             DT_CHARPTR, ValidateNotEmpty},
                {"options",     "prefixquit",   "",                     new ValueContainerChar (this->PrefixQuit),              DT_CHARPTR, NoValidation},
+               {"options",     "suffixquit",   "",                     new ValueContainerChar (this->SuffixQuit),              DT_CHARPTR, NoValidation},
+               {"options",     "fixedquit",    "",                     new ValueContainerChar (this->FixedQuit),               DT_CHARPTR, NoValidation},
                {"options",     "loglevel",     "default",              new ValueContainerChar (debug),                         DT_CHARPTR, ValidateLogLevel},
                {"options",     "netbuffersize","10240",                new ValueContainerInt  (&this->NetBufferSize),          DT_INTEGER, ValidateNetBufferSize},
                {"options",     "maxwho",       "128",                  new ValueContainerInt  (&this->MaxWhoResults),          DT_INTEGER, ValidateMaxWho},
                {"options",     "allowhalfop",  "0",                    new ValueContainerBool (&this->AllowHalfop),            DT_BOOLEAN, NoValidation},
-               {"dns",         "server",       "",                     new ValueContainerChar (this->DNSServer),               DT_CHARPTR, ValidateDnsServer},
+               {"dns",         "server",       "",                     new ValueContainerChar (this->DNSServer),               DT_CHARPTR, DNSServerValidator},
                {"dns",         "timeout",      "5",                    new ValueContainerInt  (&this->dns_timeout),            DT_INTEGER, NoValidation},
                {"options",     "moduledir",    MOD_PATH,               new ValueContainerChar (this->ModPath),                 DT_CHARPTR, NoValidation},
                {"disabled",    "commands",     "",                     new ValueContainerChar (this->DisabledCommands),        DT_CHARPTR, NoValidation},
@@ -585,12 +643,17 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"options",     "hidesplits",   "0",                    new ValueContainerBool (&this->HideSplits),             DT_BOOLEAN, NoValidation},
                {"options",     "hidebans",     "0",                    new ValueContainerBool (&this->HideBans),               DT_BOOLEAN, NoValidation},
                {"options",     "hidewhois",    "",                     new ValueContainerChar (this->HideWhoisServer),         DT_CHARPTR, NoValidation},
+               {"options",     "hidekills",    "",                     new ValueContainerChar (this->HideKillsServer),         DT_CHARPTR, NoValidation},
                {"options",     "operspywhois", "0",                    new ValueContainerBool (&this->OperSpyWhois),           DT_BOOLEAN, NoValidation},
                {"options",     "nouserdns",    "0",                    new ValueContainerBool (&this->NoUserDns),              DT_BOOLEAN, NoValidation},
                {"options",     "syntaxhints",  "0",                    new ValueContainerBool (&this->SyntaxHints),            DT_BOOLEAN, NoValidation},
                {"options",     "cyclehosts",   "0",                    new ValueContainerBool (&this->CycleHosts),             DT_BOOLEAN, NoValidation},
                {"options",     "ircumsgprefix","0",                    new ValueContainerBool (&this->UndernetMsgPrefix),      DT_BOOLEAN, NoValidation},
+               {"options",     "announceinvites", "1",                 new ValueContainerBool (&this->AnnounceInvites),        DT_BOOLEAN, NoValidation},
                {"options",     "hostintopic",  "1",                    new ValueContainerBool (&this->FullHostInTopic),        DT_BOOLEAN, NoValidation},
+               {"options",     "hidemodes",    "",                     new ValueContainerChar (hidemodes),                     DT_CHARPTR, ValidateModeLists},
+               {"options",     "exemptchanops","",                     new ValueContainerChar (exemptchanops),                 DT_CHARPTR, ValidateExemptChanOps},
+               {"options",     "defaultmodes", "nt",                   new ValueContainerChar (this->DefaultModes),            DT_CHARPTR, NoValidation},
                {"pid",         "file",         "",                     new ValueContainerChar (this->PID),                     DT_CHARPTR, NoValidation},
                {"whowas",      "groupsize",    "10",                   new ValueContainerInt  (&this->WhoWasGroupSize),        DT_INTEGER, NoValidation},
                {"whowas",      "maxgroups",    "10240",                new ValueContainerInt  (&this->WhoWasMaxGroups),        DT_INTEGER, NoValidation},
@@ -608,17 +671,22 @@ void ServerConfig::Read(bool bail, userrec* user)
 
                {"connect",
                                {"allow",       "deny",         "password",     "timeout",      "pingfreq",     "flood",
-                               "threshold",    "sendq",        "recvq",        "localmax",     "globalmax",    NULL},
+                               "threshold",    "sendq",        "recvq",        "localmax",     "globalmax",    "port",
+                               "name",         "parent",       "maxchans",
+                               NULL},
                                {"",            "",             "",             "",             "120",          "",
-                                "",            "",             "",             "3",            "3",            NULL},
+                                "",            "",             "",             "3",            "3",            "0",
+                                "",            "",
+                                NULL},
                                {DT_CHARPTR,    DT_CHARPTR,     DT_CHARPTR,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,
-                                DT_INTEGER,    DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER},
+                                DT_INTEGER,    DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,
+                                DT_CHARPTR,    DT_CHARPTR,     DT_INTEGER},
                                InitConnect, DoConnect, DoneConnect},
 
                {"uline",
-                               {"server",      NULL},
-                               {"",            NULL},
-                               {DT_CHARPTR},
+                               {"server",      "silent",       NULL},
+                               {"",            "0",            NULL},
+                               {DT_CHARPTR,    DT_BOOLEAN},
                                InitULine,DoULine,DoneULine},
 
                {"banlist",
@@ -679,7 +747,7 @@ void ServerConfig::Read(bool bail, userrec* user)
        /* Make a copy here so if it fails then we can carry on running with an unaffected config */
        ConfigDataHash newconfig;
 
-       if (this->LoadConf(newconfig, CONFIG_FILE, errstr))
+       if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr))
        {
                /* If we succeeded, set the ircd config to the new one */
                this->config_data = newconfig;
@@ -719,7 +787,8 @@ void ServerConfig::Read(bool bail, userrec* user)
                                case DT_CHARPTR:
                                {
                                        ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
-                                       vcc->Set(vi.GetString(), strlen(vi.GetString()));
+                                       /* Make sure we also copy the null terminator */
+                                       vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
                                }
                                break;
                                case DT_INTEGER:
@@ -821,12 +890,12 @@ void ServerConfig::Read(bool bail, userrec* user)
        {
                int found_ports = 0;
                FailedPortList pl;
-               ServerInstance->stats->BoundPortCount = ServerInstance->BindPorts(false, found_ports, pl);
+               ServerInstance->BindPorts(false, found_ports, pl);
 
-               if (pl.size())
+               if (pl.size() && user)
                {
                        user->WriteServ("NOTICE %s :*** Not all your client ports could be bound.", user->nick);
-                       user->WriteServ("NOTICE %s :*** The following port%s failed to bind:", user->nick, found_ports - ServerInstance->stats->BoundPortCount != 1 ? "s" : "");
+                       user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick);
                        int j = 1;
                        for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
                        {
@@ -879,6 +948,9 @@ void ServerConfig::Read(bool bail, userrec* user)
                ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
        }
 
+       /** Note: This is safe, the method checks for user == NULL */
+       ServerInstance->Parser->SetupCommandTable(user);
+
        if (user)
                user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick);
        else
@@ -894,6 +966,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
        bool in_tag;
        bool in_quote;
        bool in_comment;
+       int character_count = 0;
 
        linenumber = 1;
        in_tag = false;
@@ -923,8 +996,23 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
        include_stack.push_back(filename);
 
        /* Start reading characters... */
-       while(conf.get(ch))
+       while (conf.get(ch))
        {
+
+               /*
+                * Fix for moronic windows issue spotted by Adremelech.
+                * Some windows editors save text files as utf-16, which is
+                * a total pain in the ass to parse. Users should save in the
+                * right config format! If we ever see a file where the first
+                * byte is 0xFF or 0xFE, or the second is 0xFF or 0xFE, then
+                * this is most likely a utf-16 file. Bail out and insult user.
+                */
+               if ((character_count++ < 2) && (ch == '\xFF' || ch == '\xFE'))
+               {
+                       errorstream << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl;
+                       return false;
+               }
+
                /*
                 * Here we try and get individual tags on separate lines,
                 * this would be so easy if we just made people format
@@ -934,16 +1022,10 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                 * no '>' then die with an error.
                 */
 
-               if((ch == '#') && !in_quote)
+               if ((ch == '#') && !in_quote)
                        in_comment = true;
 
-               /*if(((ch == '\n') || (ch == '\r')) && in_quote)
-               {
-                       errorstream << "Got a newline within a quoted section, this is probably a typo: " << filename << ":" << linenumber << std::endl;
-                       return false;
-               }*/
-
-               switch(ch)
+               switch (ch)
                {
                        case '\n':
                                if (in_quote)
@@ -990,11 +1072,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                if (ch != '\r')
                        line += ch;
 
-               if(ch == '<')
+               if (ch == '<')
                {
-                       if(in_tag)
+                       if (in_tag)
                        {
-                               if(!in_quote)
+                               if (!in_quote)
                                {
                                        errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl;
                                        return false;
@@ -1002,7 +1084,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        }
                        else
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl;
                                        return false;
@@ -1014,11 +1096,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                }
                        }
                }
-               else if(ch == '"')
+               else if (ch == '"')
                {
-                       if(in_tag)
+                       if (in_tag)
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        // errorstream << "Closing quote in config tag on line " << linenumber << std::endl;
                                        in_quote = false;
@@ -1031,7 +1113,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        }
                        else
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        errorstream << "Found a (closing) \" outside a tag: " << filename << ":" << linenumber << std::endl;
                                }
@@ -1041,11 +1123,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                }
                        }
                }
-               else if(ch == '>')
+               else if (ch == '>')
                {
-                       if(!in_quote)
+                       if (!in_quote)
                        {
-                               if(in_tag)
+                               if (in_tag)
                                {
                                        // errorstream << "Closing config tag on line " << linenumber << std::endl;
                                        in_tag = false;
@@ -1055,7 +1137,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                         * LoadConf() and load the included config into the same ConfigDataHash
                                         */
 
-                                       if(!this->ParseLine(target, line, linenumber, errorstream))
+                                       if (!this->ParseLine(target, line, linenumber, errorstream))
                                                return false;
 
                                        line.clear();
@@ -1069,6 +1151,13 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                }
        }
 
+       /* Fix for bug #392 - if we reach the end of a file and we are still in a quote or comment, most likely the user fucked up */
+       if (in_comment || in_quote)
+       {
+               errorstream << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \
+                       is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl;
+       }
+
        return true;
 }
 
@@ -1077,7 +1166,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename,
        return this->LoadConf(target, filename.c_str(), errorstream);
 }
 
-bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long linenumber, std::ostringstream &errorstream)
+bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream)
 {
        std::string tagname;
        std::string current_key;
@@ -1089,17 +1178,15 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
 
        got_name = got_key = in_quote = false;
 
-       //std::cout << "ParseLine(data, '" << line << "', " << linenumber << ", stream)" << std::endl;
-
        for(std::string::iterator c = line.begin(); c != line.end(); c++)
        {
-               if(!got_name)
+               if (!got_name)
                {
                        /* We don't know the tag name yet. */
 
-                       if(*c != ' ')
+                       if (*c != ' ')
                        {
-                               if(*c != '<')
+                               if (*c != '<')
                                {
                                        tagname += *c;
                                }
@@ -1152,6 +1239,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                                {
                                        /* Got a 'real' \n, treat it as part of the value */
                                        current_value += '\n';
+                                       linenumber++;
                                        continue;
                                }
                                else if ((*c == '\r') && (in_quote))
@@ -1175,9 +1263,9 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                                                in_quote = false;
                                                got_key = false;
 
-                                               if((tagname == "include") && (current_key == "file"))
+                                               if ((tagname == "include") && (current_key == "file"))
                                                {
-                                                       if(!this->DoInclude(target, current_value, errorstream))
+                                                       if (!this->DoInclude(target, current_value, errorstream))
                                                                return false;
                                                }
 
@@ -1187,7 +1275,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                                }
                                else
                                {
-                                       if(in_quote)
+                                       if (in_quote)
                                        {
                                                current_value += *c;
                                        }
@@ -1208,7 +1296,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
        std::string newfile;
        std::string::size_type pos;
 
-       confpath = CONFIG_FILE;
+       confpath = ServerInstance->ConfigFileName;
        newfile = file;
 
        for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++)
@@ -1221,7 +1309,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
 
        if (file[0] != '/')
        {
-               if((pos = confpath.find("/inspircd.conf")) != std::string::npos)
+               if((pos = confpath.rfind("/")) != std::string::npos)
                {
                        /* Leaves us with just the path */
                        newfile = confpath.substr(0, pos) + std::string("/") + newfile;
@@ -1430,19 +1518,20 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname)
 
        F.clear();
 
-       if (*fname != '/')
+       if ((*fname != '/') && (*fname != '\\'))
        {
                std::string::size_type pos;
-               std::string confpath = CONFIG_FILE;
-               if((pos = confpath.find("/inspircd.conf")) != std::string::npos)
-               {
-                       /* Leaves us with just the path */
-                       std::string newfile = confpath.substr(0, pos) + std::string("/") + fname;
-                       if (!FileExists(newfile.c_str()))
-                               return false;
-                       file =  fopen(newfile.c_str(), "r");
+               std::string confpath = ServerInstance->ConfigFileName;
+               std::string newfile = fname;
 
-               }
+               if ((pos = confpath.rfind("/")) != std::string::npos)
+                       newfile = confpath.substr(0, pos) + std::string("/") + fname;
+               else if ((pos = confpath.rfind("\\")) != std::string::npos)
+                       newfile = confpath.substr(0, pos) + std::string("\\") + fname;
+
+               if (!FileExists(newfile.c_str()))
+                       return false;
+               file =  fopen(newfile.c_str(), "r");
        }
        else
        {
@@ -1496,13 +1585,17 @@ bool ServerConfig::FileExists(const char* file)
 char* ServerConfig::CleanFilename(char* name)
 {
        char* p = name + strlen(name);
-       while ((p != name) && (*p != '/')) p--;
+       while ((p != name) && (*p != '/') && (*p != '\\')) p--;
        return (p != name ? ++p : p);
 }
 
 
 bool ServerConfig::DirValid(const char* dirandfile)
 {
+#ifdef WINDOWS
+       return true;
+#endif
+
        char work[1024];
        char buffer[1024];
        char otherdir[1024];
@@ -1541,7 +1634,6 @@ bool ServerConfig::DirValid(const char* dirandfile)
        if (strlen(otherdir) >= t)
        {
                otherdir[t] = '\0';
-
                if (!strcmp(otherdir,work))
                {
                        return true;
@@ -1555,42 +1647,39 @@ bool ServerConfig::DirValid(const char* dirandfile)
        }
 }
 
-std::string ServerConfig::GetFullProgDir(char** argv, int argc)
+std::string ServerConfig::GetFullProgDir()
 {
-       char work[1024];
-       char buffer[1024];
-       char otherdir[1024];
-       int p;
-
-       strlcpy(work,argv[0],1024);
-       p = strlen(work);
-
-       // we just want the dir
-       while (*work)
+       char buffer[PATH_MAX+1];
+#ifdef WINDOWS
+       /* Windows has specific api calls to get the exe path that never fail.
+        * For once, windows has something of use, compared to the POSIX code
+        * for this, this is positively neato.
+        */
+       if (GetModuleFileName(NULL, buffer, MAX_PATH))
        {
-               if (work[p] == '/')
-               {
-                       work[p] = '\0';
-                       break;
-               }
-
-               work[p--] = '\0';
+               std::string fullpath = buffer;
+               std::string::size_type n = fullpath.rfind("\\inspircd.exe");
+               return std::string(fullpath, 0, n);
        }
-
+#else
        // Get the current working directory
-       if (getcwd(buffer, 1024) == NULL)
-               return "";
-
-       if (chdir(work) == -1)
-               return "";
-
-       if (getcwd(otherdir, 1024) == NULL)
-               return "";
+       if (getcwd(buffer, PATH_MAX))
+       {
+               std::string remainder = this->argv[0];
 
-       if (chdir(buffer) == -1)
-               return "";
+               /* Does argv[0] start with /? its a full path, use it */
+               if (remainder[0] == '/')
+               {
+                       std::string::size_type n = remainder.rfind("/inspircd");
+                       return std::string(remainder, 0, n);
+               }
 
-       return otherdir;
+               std::string fullpath = std::string(buffer) + "/" + remainder;
+               std::string::size_type n = fullpath.rfind("/inspircd");
+               return std::string(fullpath, 0, n);
+       }
+#endif
+       return "/";
 }
 
 InspIRCd* ServerConfig::GetInstance()