Use the normal method for applying a default config in dnsbl.

[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 90d1f50e20ff757e654febe0011163efc668ea95..f843512058b12576f0eb2b2e2cf8c16e155aa131 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -253,17 +253,16 @@ class ModuleDNSBL : public Module, public Stats::EventListener
         */
        DNSBLConfEntry::EnumBanaction str2banaction(const std::string &action)
        {
-               if(action.compare("KILL")==0)
+               if (stdalgo::string::equalsci(action, "kill"))
                        return DNSBLConfEntry::I_KILL;
-               if(action.compare("KLINE")==0)
+               if (stdalgo::string::equalsci(action, "kline"))
                        return DNSBLConfEntry::I_KLINE;
-               if(action.compare("ZLINE")==0)
+               if (stdalgo::string::equalsci(action, "zline"))
                        return DNSBLConfEntry::I_ZLINE;
-               if(action.compare("GLINE")==0)
+               if (stdalgo::string::equalsci(action, "gline"))
                        return DNSBLConfEntry::I_GLINE;
-               if(action.compare("MARK")==0)
+               if (stdalgo::string::equalsci(action, "mark"))
                        return DNSBLConfEntry::I_MARK;
-
                return DNSBLConfEntry::I_UNKNOWN;
        }
  public:
@@ -300,7 +299,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                        e->name = tag->getString("name");
                        e->ident = tag->getString("ident");
                        e->host = tag->getString("host");
-                       e->reason = tag->getString("reason");
+                       e->reason = tag->getString("reason", "Your IP has been blacklisted.", 1);
                        e->domain = tag->getString("domain");
 
                        if (stdalgo::string::equalsci(tag->getString("type"), "bitmask"))
@@ -342,13 +341,6 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                        }
                        else
                        {
-                               if (e->reason.empty())
-                               {
-                                       std::string location = tag->getTagLocation();
-                                       ServerInstance->SNO->WriteGlobalSno('d', "DNSBL(%s): empty reason, using defaults", location.c_str());
-                                       e->reason = "Your IP has been blacklisted.";
-                               }
-
                                /* add it, all is ok */
                                newentries.push_back(e);
                        }
@@ -435,7 +427,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener
 
                std::string* match = nameExt.get(user);
                if (!match)
-                       return MOD_RES_PASSTHRU;
+                       return MOD_RES_DENY;
 
                if (InspIRCd::Match(*match, dnsbl))
                        return MOD_RES_PASSTHRU;