Forward port r9782: show IP (not unknown) for unauthed connections

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

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index fa8dd9815e7de6c000a5377bf14421a1380c373e..5a0298b41e2e086e9b894b53506ddbe201d37aff 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -37,7 +37,7 @@ class SSLMode : public ModeHandler
                                        {
                                                if(!i->first->GetExt("ssl", dummy))
                                                {
-                                                       source->WriteNumeric(490, "%s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
+                                                       source->WriteNumeric(490, "%s %s :all members of the channel must be connected via SSL", source->nick.c_str(), channel->name.c_str());
                                                        return MODEACTION_DENY;
                                                }
                                        }
@@ -82,7 +82,7 @@ class ModuleSSLModes : public Module
        }
 
 
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if(chan && chan->IsModeSet('z'))
                {
@@ -94,7 +94,7 @@ class ModuleSSLModes : public Module
                        else
                        {
                                // Deny
-                               user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick, cname);
+                               user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick.c_str(), cname);
                                return 1;
                        }
                }