diff options
| -rw-r--r-- | docs/README | 2 | ||||
| -rw-r--r-- | include/account.h | 1 | ||||
| -rw-r--r-- | include/modules/sasl.h | 4 | ||||
| -rw-r--r-- | modules/m_sasl.cpp | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/docs/README b/docs/README index 2fdefbe25..19b8d5082 100644 --- a/docs/README +++ b/docs/README @@ -170,7 +170,7 @@ Table of Contents * Bahamut 1.4.27 or later (including 1.8) * Charybdis 3.4 or later - * Hybrid 8.1 or later + * Hybrid 8.2 or later * InspIRCd 1.2 or 2.0 * ngIRCd 19.2 or later * Plexus 3 or later diff --git a/include/account.h b/include/account.h index 7a0f8a61d..b6b5cdbe3 100644 --- a/include/account.h +++ b/include/account.h @@ -246,6 +246,7 @@ class CoreExport IdentifyRequest virtual void OnSuccess() = 0; virtual void OnFail() = 0; + Module *GetOwner() const { return owner; } const Anope::string &GetAccount() const { return account; } const Anope::string &GetPassword() const { return password; } diff --git a/include/modules/sasl.h b/include/modules/sasl.h index 249a4c3b0..b4fbe0d94 100644 --- a/include/modules/sasl.h +++ b/include/modules/sasl.h @@ -102,7 +102,7 @@ namespace SASL if (!hostname.empty() && !ip.empty()) user = hostname + " (" + ip + ")"; - Log(Config->GetClient("NickServ"), "sasl") << user << " identified to account " << this->GetAccount() << " using SASL"; + Log(this->GetOwner(), "sasl", Config->GetClient("NickServ")) << user << " identified to account " << this->GetAccount() << " using SASL"; sasl->Succeed(s, na->nc); delete s; } @@ -133,7 +133,7 @@ namespace SASL if (!hostname.empty() && !ip.empty()) user = hostname + " (" + ip + ")"; - Log(Config->GetClient("NickServ"), "sasl") << user << " failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL"; + Log(this->GetOwner(), "sasl", Config->GetClient("NickServ")) << user << " failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL"; } }; } diff --git a/modules/m_sasl.cpp b/modules/m_sasl.cpp index cbda5d64c..9538741a7 100644 --- a/modules/m_sasl.cpp +++ b/modules/m_sasl.cpp @@ -111,13 +111,13 @@ class External : public Mechanism NickCore *nc = certs->FindAccountFromCert(mysess->cert); if (!nc || nc->HasExt("NS_SUSPENDED") || nc->HasExt("UNCONFIRMED")) { - Log(Config->GetClient("NickServ"), "sasl") << user << " failed to identify using certificate " << mysess->cert << " using SASL EXTERNAL"; + Log(this->owner, "sasl", Config->GetClient("NickServ")) << user << " failed to identify using certificate " << mysess->cert << " using SASL EXTERNAL"; sasl->Fail(sess); delete sess; return; } - Log(Config->GetClient("NickServ"), "sasl") << user << " identified to account " << nc->display << " using SASL EXTERNAL"; + Log(this->owner, "sasl", Config->GetClient("NickServ")) << user << " identified to account " << nc->display << " using SASL EXTERNAL"; sasl->Succeed(sess, nc); delete sess; } |