Fixes

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

diff --git a/src/modules.cpp b/src/modules.cpp
index c0251f80b4d3a5de6342a04dd1a2de869153e1f4..52994622095fc426bb357f223ccdfe8236e15f86 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -328,14 +328,7 @@ void Server::RemoveSocket(InspSocket* sock)
         {
                 InspSocket* s = (InspSocket*)*a;
                 if (s == sock)
-                {
-                       log(DEBUG,"Forcibly removed socket");
-                        ServerInstance->SE->DelFd(s->GetFd());
-                        s->Close();
-                        module_sockets.erase(a);
-                        delete s;
-                        return;
-                }
+                       s->MarkAsClosed();
         }
 }
 
@@ -475,7 +468,7 @@ void Server::QuitUser(userrec* user, const std::string &reason)
        kill_link(user,reason.c_str());
 }
 
-bool Server::IsUlined(std::string server)
+bool Server::IsUlined(const std::string &server)
 {
        return is_uline(server.c_str());
 }