Merge pull request #1270 from SaberUK/master+sasl

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

diff --git a/include/configreader.h b/include/configreader.h
index f2ba16902293cf9a32b1057062c2ccb2da8162a9..4d70d8510ac25660258f2d4092da6d66fd69b0ab 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -35,7 +35,7 @@
 /** Structure representing a single \<tag> in config */
 class CoreExport ConfigTag : public refcountbase
 {
-       std::vector<KeyVal> items;
+       ConfigItems items;
  public:
        const std::string tag;
        const std::string src_name;
@@ -80,10 +80,10 @@ class CoreExport ConfigTag : public refcountbase
 
        std::string getTagLocation();
 
-       inline const std::vector<KeyVal>& getItems() const { return items; }
+       inline const ConfigItems& getItems() const { return items; }
 
-       /** Create a new ConfigTag, giving access to the private KeyVal item list */
-       static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items);
+       /** Create a new ConfigTag, giving access to the private ConfigItems item list */
+       static ConfigTag* create(const std::string& Tag, const std::string& file, int line, ConfigItems*& Items);
  private:
        ConfigTag(const std::string& Tag, const std::string& file, int line);
 };
@@ -403,6 +403,10 @@ class CoreExport ServerConfig
         */
        std::string HideKillsServer;
 
+       /** Set to hide kills from clients of ulined servers in snotices.
+        */
+       bool HideULineKills;
+
        /** The full pathname and filename of the PID
         * file as defined in the configuration.
         */
@@ -447,11 +451,11 @@ class CoreExport ServerConfig
         */
        OperIndex OperTypes;
 
-       /** Default value for <connect:maxchans>, deprecated in 2.2
+       /** Default value for <connect:maxchans>, deprecated in 3.0
         */
        unsigned int MaxChans;
 
-       /** Default value for <oper:maxchans>, deprecated in 2.2
+       /** Default value for <oper:maxchans>, deprecated in 3.0
         */
        unsigned int OperMaxChans;