Prevent fake users from quitting

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 31ffad00767f8ac9278bc7eed13806eba7cd4cf4..2189b1c8ad22be3320ae8eb04ce83611420f2805 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -171,27 +171,30 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                return;
        }
 
+       if (IS_FAKE(user))
+       {
+               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
+               return;
+       }
+
+       if (IS_FAKE(user))
+       {
+               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
+               return;
+       }
+
        user->quitting = true;
 
        ServerInstance->Logs->Log("USERS", DEBUG, "QuitUser: %s '%s'", user->nick.c_str(), quitreason.c_str());
        user->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
 
-       user->quietquit = false;
-       user->quitmsg = quitreason;
-
        std::string reason;
        std::string oper_reason;
        reason.assign(quitreason, 0, ServerInstance->Config->Limits.MaxQuit);
-       if (!*operreason)
-       {
-               user->operquitmsg = quitreason;
-               oper_reason.assign(quitreason, 0, ServerInstance->Config->Limits.MaxQuit);
-       }
-       else
-       {
-               user->operquitmsg = operreason;
+       if (operreason && *operreason)
                oper_reason.assign(operreason, 0, ServerInstance->Config->Limits.MaxQuit);
-       }
+       else
+               oper_reason = quitreason;
 
        ServerInstance->GlobalCulls.AddItem(user);
 
@@ -244,7 +247,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                        if (!user->quietquit)
                        {
                                ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",
-                                       user->nick.c_str(), user->ident.c_str(), user->host.c_str(), user->operquitmsg.c_str());
+                                       user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str());
                        }
                }
                else
@@ -252,7 +255,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                        if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
                        {
                                ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",
-                                       user->server, user->nick.c_str(), user->ident.c_str(), user->host.c_str(), user->operquitmsg.c_str());
+                                       user->server, user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str());
                        }
                }
                user->AddToWhoWas();