Update m_cloaking to use free-form keys instead of weakening the hash IV

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index db2d3b08e6a55899950fe513d486711b38b243af..2eebb1ed029f2c5035055d520b4df43aa467091c 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -63,7 +63,7 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
        /* The users default nick is their UUID */
        New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
 
-       New->server = ServerInstance->FindServerNamePtr(ServerInstance->Config->ServerName);
+       New->server = ServerInstance->Config->ServerName;
        New->ident.assign("unknown");
 
        New->registered = REG_NONE;
@@ -117,8 +117,8 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
                {
                        /* user banned */
                        ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
-                       if (*ServerInstance->Config->MoronBanner)
-                               New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner);
+                       if (!ServerInstance->Config->MoronBanner.empty())
+                               New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner.c_str());
                        this->QuitUser(New, b->Reason);
                        return;
                }
@@ -171,7 +171,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                return;
        }
 
-       if (IS_FAKE(user))
+       if (IS_SERVER(user))
        {
                ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
                return;
@@ -195,7 +195,6 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
        if (user->registered == REG_ALL)
        {
                FOREACH_MOD(I_OnUserQuit,OnUserQuit(user, reason, oper_reason));
-               user->PurgeEmptyChannels();
                user->WriteCommonQuit(reason, oper_reason);
        }
 
@@ -245,7 +244,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(), oper_reason.c_str());
+                                       user->server.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str());
                        }
                }
                user->AddToWhoWas();
@@ -422,7 +421,7 @@ void UserManager::ServerNoticeAll(const char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName, textbuffer);
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
 
        for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
@@ -443,7 +442,7 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName, textbuffer);
+       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
 
        for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {