Blah

[user/henk/code/inspircd.git] / src / modules / m_dnsbl.cpp

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 03653350ffa1a238ab9ada6c540571cd6863ac71..03b691ece192c967f6b11d88184f828a59554356 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -94,10 +94,12 @@ class DNSBLResolver : public Resolver
                                if (bitmask != 0)
                                {
                                        std::string reason = ConfEntry->reason;
-
-                                       while (int pos = reason.find("%ip%") != std::string::npos)
+                                       std::string::size_type x = reason.find("%ip%");
+                                       while (x != std::string::npos)
                                        {
-                                               reason.replace(pos, 4, them->GetIPString());
+                                               reason.erase(x, 4);
+                                               reason.insert(x, "%ip%");
+                                               x = reason.find("%ip%");
                                        }
 
                                        ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask);
@@ -106,7 +108,7 @@ class DNSBLResolver : public Resolver
                                        {
                                                case DNSBLConfEntry::I_KILL:
                                                {
-                                                       them->QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
+                                                       userrec::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
                                                        break;
                                                }
                                                case DNSBLConfEntry::I_KLINE: