diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-01-15 20:24:06 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-01-15 20:24:06 +0000 |
| commit | 2822a9f36e0c915227fe3eb87e43a77ff0232bad (patch) | |
| tree | 6be7209d21431a69338c3ed9f53c4be725a3ef19 | |
| parent | e5f9f1f62113b8e1f5bd774b89138d8afc239eba (diff) | |
Fixes to make this actually WORK.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2805 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | include/inspircd_io.h | 2 | ||||
| -rw-r--r-- | src/inspircd_io.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/inspircd_io.h b/include/inspircd_io.h index f1b5e8afe..19fce0847 100644 --- 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 67baa11ad..afed864f7 100644 --- 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; } |