Fixes to make this actually WORK.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2805 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/inspircd_io.h b/include/inspircd_io.h
index f1b5e8afe081fdb8d9fe23d85932fe28b2935077..19fce08471e1fa31600ccb20e96061ffa9e6c2b8 100644 (file)
--- a/include/inspircd_io.h
+++ b/include/inspircd_io.h
@@ -63,7 +63,7 @@ class ServerConfig : public classbase
 
        /** Check that there is only one of each configuration item
         */
-       bool CheckOnce(char* tag,bool bail);
+       bool CheckOnce(char* tag, bool bail, userrec* user);
 
   public:
 

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 67baa11ad73755d63f285310066569a4e8ed801e..afed864f77469c88bb1805e88b40de8adb526cb0 100644 (file)
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -91,7 +91,7 @@ bool ServerConfig::DelIOHook(int port)
        return false;
 }
 
-bool ServerConfig::CheckOnce(char* tag,bool bail)
+bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
 {
        if (ConfValueEnum(tag,&Config->config_f) > 1)
        {
@@ -162,8 +162,10 @@ void ServerConfig::Read(bool bail, userrec* user)
 
        /* Check we dont have more than one of singular tags
         */
-       if (!CheckOnce("server") || !CheckOnce("admin") || !CheckOnce("files") || !CheckOnce("power") || !CheckOnce("options")
-               || !CheckOnce("dns") || !CheckOnce("options") || !CheckOnce("disabled") || !CheckOnce("pid"))
+       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("options",bail,user)
+               || !CheckOnce("disabled",bail,user) || !CheckOnce("pid",bail,user))
        {
                return;
        }