Fix SID-sourced KILL being displayed to killee as from SID not from server name

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 7a42bccbbb4ba201943cf9926a9022ddfd520a2f..b8195ee9f6c4475c8b64a6fae8c2310b8daedce3 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -81,7 +81,7 @@ int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
                        /* 0: check status, 1: don't, -1: disallow change silently */
 
                        FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(u,this,ntopic));
-               
+
                        if (MOD_RESULT == 1)
                                return CMD_FAILURE;
                        else if (MOD_RESULT == 0)
@@ -296,6 +296,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 
        strlcpy(cname, cn, Instance->Config->Limits.ChanMax);
        Ptr = Instance->FindChan(cname);
+       bool created_by_local = false;
 
        if (!Ptr)
        {
@@ -310,6 +311,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
                else
                {
                        privs = "@";
+                       created_by_local = true;
                }
 
                if (IS_LOCAL(user) && override == false)
@@ -412,9 +414,11 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
                }
        }
 
-       /* As spotted by jilles, dont bother to set this on remote users */
-       if (IS_LOCAL(user) && Ptr->GetUserCounter() == 0)
+       if (created_by_local)
+       {
+               /* As spotted by jilles, dont bother to set this on remote users */
                Ptr->SetDefaultModes();
+       }
 
        return Channel::ForceChan(Instance, Ptr, user, privs, bursting);
 }