Decide that it wasn't quite appropriate :(

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

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 5995115f5302092778ff086adbaa3b7aa80c9d04..aee8abe88d2ecc57c1814a71091a4f1aa50dadbd 100644 (file)
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -82,7 +82,12 @@ bool ServerConfig::AddIOHook(int port, Module* iomod)
                IOHookModule[port] = iomod;
                return true;
        }
-       return false;
+       else
+       {
+               ModuleException err("Port already hooked by another module");
+               throw(err);
+               return false;
+       }
 }
 
 bool ServerConfig::DelIOHook(int port)
@@ -197,8 +202,7 @@ void ServerConfig::Read(bool bail, userrec* user)
        /* Check we dont have more than one of singular tags
         */
        if (!CheckOnce("server",bail,user) || !CheckOnce("admin",bail,user) || !CheckOnce("files",bail,user)
-               || !CheckOnce("power",bail,user) || !CheckOnce("options",bail,user)
-               || !CheckOnce("dns",bail,user) || !CheckOnce("pid",bail,user))
+               || !CheckOnce("power",bail,user) || !CheckOnce("options",bail,user) || !CheckOnce("pid",bail,user))
        {
                return;
        }
@@ -259,7 +263,7 @@ void ServerConfig::Read(bool bail, userrec* user)
         Config->dns_timeout = atoi(DNT);
        if (!strchr(Config->ServerName,'.'))
        {
-               log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s\.'",Config->ServerName,Config->ServerName);
+               log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",Config->ServerName,Config->ServerName,'.');
                strlcat(Config->ServerName,".",MAXBUF);
        }
         if (!Config->dns_timeout)