Fix this not working.

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index d85bf3d8cfa9ecf2fc0dceb13171faf90c5cf0e5..0bb22e43a679aa2e9212cde11e07dc421d7bf929 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -78,7 +78,6 @@ bool ServerConfig::AddIOHook(Module* iomod, InspSocket* is)
 {
        if (!GetIOHook(is))
        {
-               ServerInstance->Log(DEBUG,"Hooked inspsocket %08x", is);
                SocketIOHookModule[is] = iomod;
                is->IsIOHooked = true;
                return true;
@@ -152,46 +151,12 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
        
        if (count > 1)
        {
-               if (bail)
-               {
-                       printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag);
-                       InspIRCd::Exit(EXIT_STATUS_CONFIG);
-               }
-               else
-               {
-                       if (user)
-                       {
-                               user->WriteServ("There were errors in your configuration:");
-                               user->WriteServ("You have more than one <%s> tag, this is not permitted.\n",tag);
-                       }
-                       else
-                       {
-                               ServerInstance->WriteOpers("There were errors in the configuration file:");
-                               ServerInstance->WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
-                       }
-               }
+               throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted.");
                return false;
        }
        if (count < 1)
        {
-               if (bail)
-               {
-                       printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag);
-                       InspIRCd::Exit(EXIT_STATUS_CONFIG);
-               }
-               else
-               {
-                       if (user)
-                       {
-                               user->WriteServ("There were errors in your configuration:");
-                               user->WriteServ("You have not defined a <%s> tag, this is required.",tag);
-                       }
-                       else
-                       {
-                               ServerInstance->WriteOpers("There were errors in the configuration file:");
-                               ServerInstance->WriteOpers("You have not defined a <%s> tag, this is required.",tag);
-                       }
-               }
+               throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required.");
                return false;
        }
        return true;
@@ -199,7 +164,6 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
 
 bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-       conf->GetInstance()->Log(DEBUG,"No validation for <%s:%s>",tag,value);
        return true;
 }
 
@@ -245,7 +209,6 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance)
                nspace::hash_map<std::string,command_t*>::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
                if (cm != ServerInstance->Parser->cmdlist.end())
                {
-                       ServerInstance->Log(DEBUG,"Disabling command '%s'",cm->second->command.c_str());
                        cm->second->Disable(true);
                }
        }
@@ -292,6 +255,13 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, V
 
 bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
+       /* If we already have a servername, and they changed it, we should throw an exception. */
+       if ((strcasecmp(conf->ServerName, data.GetString())) && (*conf->ServerName)) 
+       {
+               throw CoreException("Configuration error: You cannot change your servername at runtime! Please restart your server for this change to be applied.");
+               /* XXX: We don't actually reach this return of course... */
+               return false;
+       }
        if (!strchr(data.GetString(),'.'))
        {
                conf->GetInstance()->Log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.');
@@ -369,7 +339,6 @@ bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, Valu
                conf->WhoWasMaxKeep = 3600;
                conf->GetInstance()->Log(DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
        }
-       conf->GetInstance()->Log(DEBUG,"whowas:groupsize:%d maxgroups:%d maxkeep:%d",conf->WhoWasGroupSize,conf->WhoWasMaxGroups,conf->WhoWasMaxKeep);
 
        command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
        if (whowas_command)
@@ -425,7 +394,6 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v
  */
 bool DoneConnect(ServerConfig* conf, const char* tag)
 {
-       conf->GetInstance()->Log(DEBUG,"DoneConnect called for tag: %s",tag);
        return true;
 }
 
@@ -442,7 +410,6 @@ 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->GetInstance()->Log(DEBUG,"Read ULINE '%s'",server);
        conf->ulines.push_back(server);
        return true;
 }
@@ -739,7 +706,8 @@ void ServerConfig::Read(bool bail, userrec* user)
                        ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
                        ValueItem vi(item);
 
-                       Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi);
+                       if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi))
+                               throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information.");
 
                        switch (Values[Index].datatype)
                        {
@@ -969,10 +937,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                {
                        case '\n':
                                if (in_quote)
-                               {
-                                       ServerInstance->Log(DEBUG, "Got \\n inside value");
                                        line += '\n';
-                               }
                                linenumber++;
                        case '\r':
                                if (!in_quote)
@@ -997,11 +962,9 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                if ((ch == '\\') && (in_quote) && (in_tag))
                {
                        line += ch;
-                       ServerInstance->Log(DEBUG,"Escape sequence in config line.");
                        char real_character;
                        if (conf.get(real_character))
                        {
-                               ServerInstance->Log(DEBUG,"Escaping %c", real_character);
                                if (real_character == 'n')
                                        real_character = '\n';
                                line += real_character;
@@ -1312,7 +1275,6 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con
                if (!default_value.empty())
                {
                        result = default_value;
-                       ServerInstance->Log(DEBUG, "No config option for '%s' in tag <%s> using default: %s", var.c_str(), tag.c_str(), default_value.c_str());
                        return true;
                }
        }
@@ -1321,14 +1283,8 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con
                if (!default_value.empty())
                {
                        result = default_value;
-                       ServerInstance->Log(DEBUG, "No <%s:%s> tags in config file using default: %s", tag.c_str(), var.c_str(), default_value.c_str());
                        return true;
                }
-               ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str());
-       }
-       else
-       {
-               ServerInstance->Log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
        }
        return false;
 }
@@ -1448,14 +1404,6 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in
                
                return iter->second.size();
        }
-       else if(pos == 0)
-       {
-               ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str());
-       }
-       else
-       {
-               ServerInstance->Log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
-       }
        
        return 0;
 }
@@ -1464,6 +1412,9 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in
  */
 bool ServerConfig::ReadFile(file_cache &F, const char* fname)
 {
+       if (!fname || !*fname)
+               return false;
+
        FILE* file = NULL;
        char linebuf[MAXBUF];