From 9baeec44d07dd7894fbbdb85913337e418deff93 Mon Sep 17 00:00:00 2001
From: Robby- <robby@chat.be>
Date: Wed, 13 Nov 2013 21:01:24 +0100
Subject: m_ident: Add an option to allow idents of users to still be prefixed
 with a '~' for connect classes which have disabled ident lookups through the
 <connect:useident> setting.

Fixes #683.

Some changes by @attilamolnar, original PR #684
---
 src/modules/m_ident.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_ident.cpp')

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 1e01806b8..ae21c6940 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -268,6 +268,7 @@ class IdentRequestSocket : public EventHandler
 class ModuleIdent : public Module
 {
 	int RequestTimeout;
+	bool NoLookupPrefix;
 	SimpleExtItem<IdentRequestSocket, stdalgo::culldeleter> ext;
  public:
 	ModuleIdent() : ext("ident_socket", this)
@@ -281,9 +282,11 @@ class ModuleIdent : public Module
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("ident");
+		RequestTimeout = tag->getInt("timeout", 5);
 		if (!RequestTimeout)
 			RequestTimeout = 5;
+		NoLookupPrefix = tag->getBool("nolookupprefix", false);
 	}
 
 	void OnUserInit(LocalUser *user) CXX11_OVERRIDE
@@ -314,7 +317,11 @@ class ModuleIdent : public Module
 		/* Does user have an ident socket attached at all? */
 		IdentRequestSocket *isock = ext.get(user);
 		if (!isock)
+		{
+			if ((NoLookupPrefix) && (user->ident[0] != '~'))
+				user->ident.insert(user->ident.begin(), 1, '~');
 			return MOD_RES_PASSTHRU;
+		}
 
 		time_t compare = isock->age;
 		compare += RequestTimeout;
-- 
cgit v1.2.3