Fix for crash found by potter if you set up two redirects in two channels to forward...

[user/henk/code/inspircd.git] / src / cmd_whois.cpp

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 58328b3cc095d331b8021fe8a5e9e591c79b8ec5..4b7c3807da943575655fa43bbc51fc4e2750af54 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -20,13 +20,19 @@
 
 void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick)
 {
-       // bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER
+       if (dest->Visibility && !dest->Visibility->VisibleTo(user))
+       {
+               ServerInstance->SendWhoisLine(user, dest, 401, "%s %s :No such nick/channel",user->nick, *nick ? nick : "*");
+               ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick, *nick ? nick : "*");
+               return;
+       }
+
        if (dest->registered == REG_ALL)
        {
                ServerInstance->SendWhoisLine(user, dest, 311, "%s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
                if ((user == dest) || (*user->oper))
                {
-                       ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
+                       ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from %s@%s %s", user->nick, dest->nick, dest->ident, dest->host, dest->GetIPString());
                }
                std::string cl = dest->ChannelList(user);
                if (cl.length())
@@ -56,10 +62,9 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
                {
                        ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),irc::Spacify(dest->oper), ServerInstance->Config->Network);
                }
-               if ((!signon) && (!idle))
-               {
-                       FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
-               }
+
+               FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
+
                if (!strcasecmp(user->server,dest->server))
                {
                        // idle time and signon line can only be sent if youre on the same server (according to RFC)
@@ -93,6 +98,7 @@ CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
                return CMD_SUCCESS;
 
        dest = ServerInstance->FindNick(parameters[0]);
+
        if (dest)
        {
                do_whois(this->ServerInstance, user,dest,0,0,parameters[0]);