diff options
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 7 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_openssl.cpp | 9 | ||||
| -rw-r--r-- | src/modules/m_customtitle.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_swhois.cpp | 4 |
4 files changed, 17 insertions, 5 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 81d919ad6..3f9c4ac5d 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -713,7 +713,7 @@ class ModuleSSLGnuTLS : public Module { // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW. std::deque<std::string>* metadata = new std::deque<std::string>; - metadata->push_back(user->nick); + metadata->push_back(user->uuid); metadata->push_back("ssl"); // The metadata id metadata->push_back("ON"); // The value to send Event* event = new Event((char*)metadata,(Module*)this,"send_metadata"); @@ -901,6 +901,11 @@ class ModuleSSLGnuTLS : public Module GenericCapHandler(ev, "tls", "tls"); } + void Prioritize() + { + Module* server = ServerInstance->Modules->Find("m_spanningtree.so"); + ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIO_AFTER, &server); + } }; MODULE_INIT(ModuleSSLGnuTLS) diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index c8fdefe62..de7101db1 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -779,7 +779,7 @@ class ModuleSSLOpenSSL : public Module { // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW. std::deque<std::string>* metadata = new std::deque<std::string>; - metadata->push_back(user->nick); + metadata->push_back(user->uuid); metadata->push_back("ssl"); // The metadata id metadata->push_back("ON"); // The value to send Event* event = new Event((char*)metadata,(Module*)this,"send_metadata"); @@ -885,6 +885,13 @@ class ModuleSSLOpenSSL : public Module X509_free(cert); } + + void Prioritize() + { + Module* server = ServerInstance->Modules->Find("m_spanningtree.so"); + ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIO_AFTER, &server); + } + }; static int error_callback(const char *str, size_t len, void *u) diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 8e87b79b4..491487b3c 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -79,7 +79,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist) user->Extend("ctitle", text); std::deque<std::string>* metadata = new std::deque<std::string>; - metadata->push_back(user->nick); + metadata->push_back(user->uuid); metadata->push_back("ctitle"); // The metadata id metadata->push_back(*text); // The value to send Event event((char*)metadata,(Module*)this,"send_metadata"); diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 350ebd648..97f69c413 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -76,7 +76,7 @@ class CommandSwhois : public Command * -- Brain */ std::deque<std::string>* metadata = new std::deque<std::string>; - metadata->push_back(dest->nick); + metadata->push_back(dest->uuid); metadata->push_back("swhois"); // The metadata id metadata->push_back(*text); // The value to send Event event((char*)metadata,(Module*)this,"send_metadata"); @@ -263,7 +263,7 @@ class ModuleSWhois : public Module std::string *text = new std::string(swhois); user->Extend("swhois", text); std::deque<std::string>* metadata = new std::deque<std::string>; - metadata->push_back(user->nick); + metadata->push_back(user->uuid); metadata->push_back("swhois"); // The metadata id metadata->push_back(*text); // The value to send Event event((char*)metadata,(Module*)this,"send_metadata"); |