Test commit

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

diff --git a/include/users.h b/include/users.h
index c4c85fb0f457f3be1c71da3ee585851a21daf4ee..5f066cdd4619235e7100daed8742741b2b0f3bb2 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -427,15 +427,15 @@ class CoreExport User : public EventHandler
         */
        InvitedList invites;
 
-       /** Cached nick!ident@host value using the real hostname
+       /** Cached nick!ident@dhost value using the displayed hostname
         */
        std::string cached_fullhost;
 
-       /** Cached nick!ident@ip value using the real IP address
+       /** Cached ident@ip value using the real IP address
         */
        std::string cached_hostip;
 
-       /** Cached nick!ident@host value using the masked hostname
+       /** Cached ident@realhost value using the real hostname
         */
        std::string cached_makehost;
 
@@ -456,10 +456,10 @@ class CoreExport User : public EventHandler
        std::map<std::string, bool>* AllowedOperCommands;
 
        /** Allowed user modes from oper classes. */
-       bool* AllowedUserModes;
+       std::bitset<64> AllowedUserModes;
 
        /** Allowed channel modes from oper classes. */
-       bool* AllowedChanModes;
+       std::bitset<64> AllowedChanModes;
 
  public:
        /** Contains a pointer to the connect class a user is on from - this will be NULL for remote connections.
@@ -520,7 +520,7 @@ class CoreExport User : public EventHandler
         */
        time_t nping;
 
-       /** Stored reverse lookup from res_forward
+       /** Stored reverse lookup from res_forward. Should not be used after resolution.
         */
        std::string stored_host;
 
@@ -708,9 +708,10 @@ class CoreExport User : public EventHandler
        User(InspIRCd* Instance, const std::string &uid = "");
 
        /** Check if the user matches a G or K line, and disconnect them if they do.
+        * @param doZline True if ZLines should be checked (if IP has changed since initial connect)
         * Returns true if the user matched a ban, false else.
         */
-       bool CheckLines();
+       bool CheckLines(bool doZline = false);
 
        /** Returns the full displayed host of the user
         * This member function returns the hostname of the user as seen by other users