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

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 460b81023..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;
 
@@ -270,12 +276,17 @@ class ModuleIdent : public Module
  public:
 	ModuleIdent() : ext("ident_socket", this)
 	{
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(ext);
 		OnRehash(NULL);
 		Implementation eventlist[] = {
 			I_OnRehash, I_OnUserInit, I_OnCheckReady,
 			I_OnUserDisconnect, I_OnSetConnectClass
 		};
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	~ModuleIdent()
@@ -289,9 +300,7 @@ class ModuleIdent : public Module
 
 	virtual void OnRehash(User *user)
 	{
-		ConfigReader Conf;
-
-		RequestTimeout = Conf.ReadInteger("ident", "timeout", 0, true);
+		RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5);
 		if (!RequestTimeout)
 			RequestTimeout = 5;
 	}
@@ -362,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;