Merge commit 'refs/merge-requests/5' of git://gitorious.org/inspircd/inspircd into...

[user/henk/code/inspircd.git] / src / bancache.cpp

diff --git a/src/bancache.cpp b/src/bancache.cpp
index 524baaad2e4805471a53ccf1030259c8c4ce8113..240be38cb8e4c1aeaf6570c981ffd43fa85a95c4 100644 (file)
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,7 +23,7 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
        if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
                return NULL;
 
-       b = new BanCacheHit(ServerInstance, ip, type, reason);
+       b = new BanCacheHit(ip, type, reason);
 
        this->BanHash->insert(std::make_pair(ip, b));
        return b;
@@ -36,7 +36,7 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
        if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
                return NULL;
 
-       b = new BanCacheHit(ServerInstance, ip, type, reason, seconds);
+       b = new BanCacheHit(ip, type, reason, seconds);
 
        this->BanHash->insert(std::make_pair(ip, b));
        return b;
@@ -158,3 +158,10 @@ void BanCacheManager::RehashCache()
        delete BanHash;
        BanHash = NewHash;
 }
+
+BanCacheManager::~BanCacheManager()
+{
+       for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); ++n)
+               delete n->second;
+       delete BanHash;
+}