Fix m_nationalchars using a copy and paste of my unsafe copy and paste algorithm...

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

diff --git a/include/configreader.h b/include/configreader.h
index 31551dedb3b9031fb06a90908dee2ae2d16b5a8b..0b05262b436e30e7e2d5dabd73a4d1693b2feb0e 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -232,13 +232,19 @@ struct operclass_data : public Extensible
 {
        /** Command list for the class
         */
-       char* commandlist;
+       char *commandlist;
+
        /** Channel mode list for the class
         */
-       char* cmodelist;
+       char *cmodelist;
+
        /** User mode list for the class
         */
-       char* umodelist;
+       char *umodelist;
+
+       /** Priviledges given by this class
+        */
+       char *privs;
 };
 
 /** A Set of oper classes
@@ -343,7 +349,7 @@ class CoreExport ServerConfig : public Extensible
 
        /** Error stream, contains error output from any failed configuration parsing.
         */
-       std::ostringstream errstr;
+       std::ostringstream* errstr;
 
        /** Holds the new configuration when a rehash occurs so we dont overwrite the existing
         * working config with a broken one without checking it first and swapping pointers.
@@ -400,6 +406,11 @@ class CoreExport ServerConfig : public Extensible
         */
        int WhoWasMaxKeep;
 
+       /** Both for set(g|u)id.
+        */
+       char SetUser[MAXBUF];
+       char SetGroup[MAXBUF];
+
        /** Holds the server name of the local server
         * as defined by the administrator.
         */
@@ -554,6 +565,11 @@ class CoreExport ServerConfig : public Extensible
         */
        bool writelog;
 
+       /** If this value is true, banned users (+b, not extbans) will not be able to change nick
+        * if banned on any channel, nor to message them.
+        */
+       bool RestrictBannedUsers;
+
        /** If this value is true, halfops have been
         * enabled in the configuration file.
         */
@@ -792,9 +808,9 @@ class CoreExport ServerConfig : public Extensible
 
        /** Report a configuration error given in errormessage.
         * @param bail If this is set to true, the error is sent to the console, and the program exits
-        * @param user If this is set to a non-null value, and bail is false, the errors are spooled to
-        * this user as SNOTICEs.
-        * If the parameter is NULL, the messages are spooled to all opers.
+        * @param useruid If this is set to a non-empty value which is a valid UID, and bail is false,
+        * the errors are spooled to this user as SNOTICEs.
+        * If the parameter is not a valid UID, the messages are spooled to all opers.
         */
        void ReportConfigError(const std::string &errormessage, bool bail, const std::string &useruid);