summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <adam@sigterm.info>2017-01-16 18:33:09 -0500
committerGitHub <noreply@github.com>2017-01-16 18:33:09 -0500
commit847dfd952326e9d7993aa0776ecce82402a4f416 (patch)
tree4eb6a8cf95226f20d2c91007bf724383d9076e13
parenta96e40e24901a756b71e81f3e8fed83e9fdef1e4 (diff)
parentaefde6e44d0c694119870f3d2462bdcda35d4291 (diff)
Merge pull request #182 from genius3000/2.0+protocol_match_name
protocol/inspircd: Match servername as well on ENCAP
-rw-r--r--modules/protocol/inspircd12.cpp2
-rw-r--r--modules/protocol/inspircd20.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index a93378ef3..bd4975741 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -873,7 +873,7 @@ struct IRCDMessageEncap : IRCDMessage
void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
{
- if (Anope::Match(Me->GetSID(), params[0]) == false)
+ if (!Anope::Match(Me->GetSID(), params[0]) && !Anope::Match(Me->GetName(), params[0]))
return;
if (SASL::sasl && params[1] == "SASL" && params.size() >= 6)
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index ce5f8e062..ab7649b69 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -774,7 +774,7 @@ struct IRCDMessageEncap : IRCDMessage
void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
{
- if (Anope::Match(Me->GetSID(), params[0]) == false)
+ if (!Anope::Match(Me->GetSID(), params[0]) && !Anope::Match(Me->GetName(), params[0]))
return;
if (params[1] == "CHGIDENT")