diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/inspircd.cpp | 1 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 3 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_openssl.cpp | 3 | ||||
| -rw-r--r-- | src/users.cpp | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 10143b54b..120ee2be8 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -136,6 +136,7 @@ void InspIRCd::Cleanup() /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */ /* Must be deleted before modes as it decrements modelines */ DeleteZero(this->Users); + DeleteZero(this->FakeClient); DeleteZero(this->Modes); DeleteZero(this->XLines); DeleteZero(this->Parser); diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index a769bd12b..1c90428b2 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -668,8 +668,7 @@ class ModuleSSLGnuTLS : public Module EventHandler *extendme = ServerInstance->SE->GetRef(fd); if (extendme) { - if (!extendme->GetExt("ssl")) - extendme->Extend("ssl", "ON"); + extendme->Extend("ssl"); } // Change the seesion state diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 9bce0d05e..55b7d8416 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -748,8 +748,7 @@ class ModuleSSLOpenSSL : public Module EventHandler *u = ServerInstance->SE->GetRef(session->fd); if (u) { - if (!u->GetExt("ssl", dummy)) - u->Extend("ssl", "ON"); + u->Extend("ssl"); } session->status = ISSL_OPEN; diff --git a/src/users.cpp b/src/users.cpp index cd5aa247e..921403f47 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1029,7 +1029,7 @@ bool User::ForceNickChange(const char* newnick) this->InvalidateCache(); - this->Extend("NICKForced", "Enabled"); + this->Extend("NICKForced"); FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick)); @@ -1048,7 +1048,7 @@ bool User::ForceNickChange(const char* newnick) std::vector<std::string> parameters; nickhandler->HandleInternal(1, dummy); parameters.push_back(newnick); - this->Extend("NICKForced", "Enabled"); + this->Extend("NICKForced"); bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS); this->Shrink("NICKForced"); nickhandler->HandleInternal(0, dummy); |