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

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

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 36880d5edf2e30b164e68af56af2979056d5e8cd..81354609f2c751a7a952d202c753a5e94dc6b27c 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -71,7 +71,7 @@ class CommandCheck : public Command
                        if (IS_OPER(targuser))
                        {
                                /* user is an oper of type ____ */
-                               user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper));
+                               user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper.c_str()));
                        }
 
                        if (IS_LOCAL(targuser))
@@ -119,7 +119,7 @@ class CommandCheck : public Command
                                /*
                                 * Unlike Asuka, I define a clone as coming from the same host. --w00t
                                 */
-                               snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick, i->first->ident, i->first->dhost, i->first->fullname);
+                               snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
                                user->WriteServ(checkstr + " member " + tmpbuf);
                        }
                }
@@ -131,13 +131,13 @@ class CommandCheck : public Command
                        /* hostname or other */
                        for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
                        {
-                               if (match(a->second->host, parameters[0].c_str()) || match(a->second->dhost, parameters[0].c_str()))
+                               if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
                                {
                                        /* host or vhost matches mask */
                                        user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
                                }
                                /* IP address */
-                               else if (match(a->second->GetIPString(), parameters[0].c_str(), true))
+                               else if (match(a->second->GetIPString(), parameters[0], true))
                                {
                                        /* same IP. */
                                        user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
@@ -147,7 +147,7 @@ class CommandCheck : public Command
                        user->WriteServ(checkstr + " matches " + ConvToStr(x));
                }
 
-               user->WriteServ(checkstr + " END " + std::string(parameters[0]));
+               user->WriteServ(checkstr + " END " + parameters[0]);
 
                return CMD_LOCALONLY;
        }