Fix a regression in m_cloaking

[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 10419de5157e59c674adb9afd2543a8c6096e5d2..63dda547fbadba3447925d09b3f7551f2bb9cdf2 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -142,7 +142,10 @@ class DNSBLResolver : public DNS::Request
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
+                                       {
                                                delete kl;
+                                               return;
+                                       }
                                        break;
                                }
                                case DNSBLConfEntry::I_GLINE:
@@ -157,7 +160,10 @@ class DNSBLResolver : public DNS::Request
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
+                                       {
                                                delete gl;
+                                               return;
+                                       }
                                        break;
                                }
                                case DNSBLConfEntry::I_ZLINE:
@@ -172,7 +178,10 @@ class DNSBLResolver : public DNS::Request
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
+                                       {
                                                delete zl;
+                                               return;
+                                       }
                                        break;
                                }
                                case DNSBLConfEntry::I_UNKNOWN:
@@ -385,12 +394,12 @@ class ModuleDNSBL : public Module
                        total_hits += (*i)->stats_hits;
                        total_misses += (*i)->stats_misses;
 
-                       results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
+                       results.push_back("304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
                                        ConvToStr((*i)->stats_hits) + " hits and " + ConvToStr((*i)->stats_misses) + " misses");
                }
 
-               results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
-               results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
+               results.push_back("304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
+               results.push_back("304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
 
                return MOD_RES_PASSTHRU;
        }