Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 4338fb9daffae390624c4469cc93a1914bd6e5ab..608ed2f1bf953186ac20fa0b1ff8a250adeff138 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -13,11 +13,7 @@
 
 #include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
-#include "mode.h"
 #include "xline.h"
 #include "exitcodes.h"
 
@@ -261,9 +257,29 @@ userrec* InspIRCd::FindNick(const char* nick)
        return iter->second;
 }
 
+userrec* InspIRCd::FindNickOnly(const std::string &nick)
+{
+       user_hash::iterator iter = clientlist->find(nick);
+
+       if (iter == clientlist->end())
+               return NULL;
+
+       return iter->second;
+}
+
+userrec* InspIRCd::FindNickOnly(const char* nick)
+{
+       user_hash::iterator iter = clientlist->find(nick);
+
+       if (iter == clientlist->end())
+               return NULL;
+
+       return iter->second;
+}
+
 userrec *InspIRCd::FindUUID(const std::string &uid)
 {
-       return InspIRCd::FindUUID(uid.c_str());
+       return FindUUID(uid.c_str());
 }
 
 userrec *InspIRCd::FindUUID(const char *uid)