X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=6099e7c1411e24659a1aed30a5dbd9034612f97a;hb=86f8294c2de86b8d060abbb02f7c51c0ca0d9ead;hp=e8f3144641b931b70f487dd0748c506867163bcf;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index e8f314464..6099e7c14 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -235,14 +235,20 @@ class IdentRequestSocket : public EventHandler
 		 */
 		ibuf[recvresult] = '\0';
 		std::string buf(ibuf);
-		std::string::size_type lastcolon = buf.rfind(':');
-		if (lastcolon == std::string::npos)
+
+		/* <2 colons: invalid
+		 *  2 colons: reply is an error
+		 * >3 colons: there is a colon in the ident
+		 */
+		if (std::count(buf.begin(), buf.end(), ':') != 3)
 			return;
 
+		std::string::size_type lastcolon = buf.rfind(':');
+
 		/* Truncate the ident at any characters we don't like, skip leading spaces */
 		for (std::string::const_iterator i = buf.begin()+lastcolon+1; i != buf.end(); ++i)
 		{
-			if (result.size()+1 == ServerInstance->Config->Limits.IdentMax)
+			if (result.size() == ServerInstance->Config->Limits.IdentMax)
 				/* Ident is getting too long */
 				break;
 
@@ -274,6 +280,7 @@ class ModuleIdent : public Module
 
 	void init()
 	{
+		ServerInstance->Modules->AddService(ext);
 		OnRehash(NULL);
 		Implementation eventlist[] = {
 			I_OnRehash, I_OnUserInit, I_OnCheckReady,
@@ -364,6 +371,7 @@ class ModuleIdent : public Module
 			user->WriteServ("NOTICE Auth :*** Found your ident, '%s'", user->ident.c_str());
 		}
 
+		user->InvalidateCache();
 		isock->Close();
 		ext.unset(user);
 		return MOD_RES_PASSTHRU;