Only announce Q:Line hits on NICK from unregistered users, thanks satmd.

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

diff --git a/include/configreader.h b/include/configreader.h
index 1bd6766bed3dfb6315db11e36c3a9cf5197204f4..2ccabc5b4793bb03e36d66b8a9428af3df0a00f1 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -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
@@ -335,7 +341,7 @@ class CoreExport ServerConfig : public Extensible
        /** User that is currently performing a rehash, needed because the
         * rehash code is now threaded and needs to know who to give errors and feedback to.
         */
-       User* RehashUser;
+       std::string RehashUserUID;
 
        /** Rehash parameter, as above
         */
@@ -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.
         */
@@ -780,7 +791,7 @@ class CoreExport ServerConfig : public Extensible
         * and initialize this class. All other methods
         * should be used only by the core.
         */
-       void Read(bool bail, User* user);
+       void Read(bool bail, const std::string &useruid);
 
        /** Read a file into a file_cache object
         */
@@ -792,11 +803,11 @@ 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, User* user);
+       void ReportConfigError(const std::string &errormessage, bool bail, const std::string &useruid);
 
        /** Load 'filename' into 'target', with the new config parser everything is parsed into
         * tag/key/value at load-time rather than at read-value time.