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

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

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 7dc960c5a188aa52cbe7357d2aac0fc1dd950993..79f9dff3c9dc99c45eeddc3104b0b947ea0c4e82 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -37,16 +37,15 @@ class CommandTline : public Command
                for (user_hash::const_iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
                {
                        n_counted++;
-                       if (match(u->second->GetFullRealHost(),parameters[0].c_str()))
+                       if (match(u->second->GetFullRealHost(),parameters[0]))
                        {
                                n_matched++;
                                n_match_host++;
                        }
                        else
                        {
-                               char host[MAXBUF];
-                               snprintf(host, MAXBUF, "%s@%s", u->second->ident, u->second->GetIPString());
-                               if (match(host, parameters[0].c_str(), true))
+                               std::string host = std::string(u->second->ident) + "@" + u->second->GetIPString();
+                               if (match(host, parameters[0], true))
                                {
                                        n_matched++;
                                        n_match_ip++;
@@ -54,9 +53,9 @@ class CommandTline : public Command
                        }
                }
                if (n_matched)
-                       user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick, n_counted, parameters[0].c_str(), n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip);
+                       user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick.c_str(), n_counted, parameters[0].c_str(), n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip);
                else
-                       user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick, n_counted, parameters[0].c_str());
+                       user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick.c_str(), n_counted, parameters[0].c_str());
 
                return CMD_LOCALONLY;                   
        }