Made m_denychans support wildcards

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

diff --git a/include/users.h b/include/users.h
index c34b60693f32558a1a105084e8794c435d2e004f..d69781f80c8679cd19aa49e1ea67b6e2912e42b3 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -67,9 +67,9 @@ class UserResolver : public Resolver
        int bound_fd;
        bool fwd;
  public:
-       UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt);
+       UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt, bool &cache);
 
-       void OnLookupComplete(const std::string &result, unsigned int ttl);
+       void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached);
        void OnError(ResolverError e, const std::string &errormessage);
 };
 
@@ -846,69 +846,6 @@ class userrec : public connection
        virtual ~userrec();
 };
 
-
-namespace irc
-{
-       /** Holds whowas related functions and classes
-        */
-       namespace whowas
-       {
-
-               /** Used to hold WHOWAS information
-                */
-               class WhoWasGroup : public classbase
-               {
-                public:
-                       /** Real host
-                        */
-                       char* host;
-                       /** Displayed host
-                        */
-                       char* dhost;
-                       /** Ident
-                        */
-                       char* ident;
-                       /** Server name
-                        */
-                       const char* server;
-                       /** Fullname (GECOS)
-                        */
-                       char* gecos;
-                       /** Signon time
-                        */
-                       time_t signon;
-       
-                       /** Initialize this WhoQasFroup with a user
-                        */
-                       WhoWasGroup(userrec* user);
-                       /** Destructor
-                        */
-                       ~WhoWasGroup();
-               };
-
-               /** A group of users related by nickname
-                */
-               typedef std::deque<WhoWasGroup*> whowas_set;
-
-               /** Sets of users in the whowas system
-                */
-               typedef std::map<irc::string,whowas_set*> whowas_users;
-
-               /** Sets of time and users in whowas list
-                */
-               typedef std::deque<std::pair<time_t,irc::string> > whowas_users_fifo;
-
-               /** Called every hour by the core to remove expired entries
-                */
-               void MaintainWhoWas(InspIRCd* ServerInstance, time_t TIME);
-
-               /** Prune for WhoWasGroupSize, WhoWasMaxGroups and
-                *  WhoWasMaxKeep on rehash
-                */
-               void PruneWhoWas(InspIRCd* ServerInstance, time_t TIME);
-       };
-};
-
 /* Configuration callbacks */
 class ServerConfig;