Fix sending DNSBL error snotices when a user isn't DNSBLed.

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

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 481a1aaba4643d00c7c81fe3cc627f7db155677c..2b38653c58007015227980450ce83041cc362adb 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -58,8 +58,8 @@ public:
        {
                if (!silent)
                {
-                       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
-                               nickname.c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time));
+                       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %ld seconds ago): %s",
+                               nickname.c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
                }
        }
 
@@ -99,7 +99,7 @@ class CommandSvshold : public Command
                flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]";
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                /* syntax: svshold nickname time :reason goes here */
                /* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -156,7 +156,7 @@ class CommandSvshold : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_BROADCAST;
        }