Fix an shadowing warning in the spanningtree module.

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

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 1b1ce9eaa090c059a89d95a8bcd862e473453771..548f4c5524fee9b64e317f15fba1ad2131f0dead 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -58,12 +58,12 @@ class SSLCertExt : public ExtensionItem
                free(container, unset_raw(container));
        }
 
-       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
+       std::string ToNetwork(const Extensible* container, void* item) const CXX11_OVERRIDE
        {
                return static_cast<ssl_cert*>(item)->GetMetaLine();
        }
 
-       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE
+       void FromNetwork(Extensible* container, const std::string& value) CXX11_OVERRIDE
        {
                ssl_cert* cert = new ssl_cert;
                set(container, cert);
@@ -303,7 +303,7 @@ class ModuleSSLInfo
 
        ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
        {
-               ssl_cert* cert = SSLClientCert::GetCertificate(&user->eh);
+               ssl_cert* cert = cmd.sslapi.GetCertificate(user);
                bool ok = true;
                if (myclass->config->getString("requiressl") == "trusted")
                {
@@ -313,7 +313,7 @@ class ModuleSSLInfo
                else if (myclass->config->getBool("requiressl"))
                {
                        ok = (cert != NULL);
-                       ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires any SSL cert. Client %s one.", (ok ? "has" : "does not have"));
+                       ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires SSL. Client %s using SSL.", (ok ? "is" : "is not"));
                }
 
                if (!ok)