Deduplicate error handling in the socket engines.

[user/henk/code/inspircd.git] / include / configreader.h

diff --git a/include/configreader.h b/include/configreader.h
index 36bb3297e5ee88b48067b747bf380262fe4e6464..9fcb9c6a333f72a12fed7dfc08a1201c91092c53 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -184,6 +184,11 @@ class CoreExport OperInfo : public refcountbase
        /** Name of the oper type; i.e. the one shown in WHOIS */
        std::string name;
 
+       /** Creates a new OperInfo with the specified oper type name.
+        * @param Name The name of the oper type.
+        */
+       OperInfo(const std::string& Name);
+
        /** Get a configuration item, searching in the oper, type, and class blocks (in that order) */
        std::string getConfig(const std::string& key);
        void init();
@@ -311,19 +316,13 @@ class CoreExport ServerConfig
         */
        bool DisabledDontExist;
 
-       /** This variable contains a space-seperated list
-        * of commands which are disabled by the
-        * administrator of the server for non-opers.
-        */
-       std::string DisabledCommands;
-
        /** This variable identifies which usermodes have been diabled.
         */
-       char DisabledUModes[64];
+       std::bitset<64> DisabledUModes;
 
        /** This variable identifies which chanmodes have been disabled.
         */
-       char DisabledCModes[64];
+       std::bitset<64> DisabledCModes;
 
        /** If set to true, then all opers on this server are
         * shown with a generic 'is an IRC operator' line rather
@@ -484,7 +483,8 @@ class CoreExport ServerConfig
 
        void Fill();
 
-       bool ApplyDisabledCommands(const std::string& data);
+       /** Disables the commands specified in <disabled:commands>. */
+       bool ApplyDisabledCommands();
 
        /** Escapes a value for storage in a configuration key.
         * @param str The string to escape.