ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
Fixes #683.

Some changes by @attilamolnar, original PR #684
This commit is contained in:
Robby- 2013-11-13 21:01:24 +01:00 committed by Attila Molnar
parent add79a98c6
commit 9baeec44d0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/conf/modules.conf.example
View File

@ -898,7 +898,7 @@
# the user in a 'connecting' state until the lookup is complete. #
# The bind value indicates which IP to bind outbound requests to. #
#
#<ident timeout="5">
#<ident timeout="5" nolookupprefix="no">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Invite exception module: Adds support for channel invite exceptions

9
src/modules/m_ident.cpp
View File

@ -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;