Fix the cloaking module on C++98 compilers.

[user/henk/code/inspircd.git] / src / modules / m_ident.cpp

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index dea411cea609da56f2fce1ee6a97c01e885f6bdb..0f746b05b1e0340f4f863c3260f8233fa7b0796f 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -1,14 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012-2013 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 John Brooks <special@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -61,7 +61,7 @@ enum
  * our ident lookup class that is outside of this module, or out-
  * side of the control of the class. There are no timers, internal
  * events, or such, which will cause the socket to be deleted,
- * queued for deletion, etc. In fact, theres not even any queueing!
+ * queued for deletion, etc. In fact, there's not even any queueing!
  *
  * Using this framework we have a much more stable module.
  *
@@ -113,8 +113,7 @@ class IdentRequestSocket : public EventHandler
                age = ServerInstance->Time();
 
                SetFd(socket(user->server_sa.family(), SOCK_STREAM, 0));
-
-               if (GetFd() == -1)
+               if (!HasFd())
                        throw ModuleException("Could not create socket");
 
                done = false;
@@ -184,7 +183,7 @@ class IdentRequestSocket : public EventHandler
 
        void Close()
        {
-               /* Remove ident socket from engine, and close it, but dont detatch it
+               /* Remove ident socket from engine, and close it, but dont detach it
                 * from its parent user class, or attempt to delete its memory.
                 */
                if (HasFd())
@@ -285,7 +284,7 @@ class ModuleIdent : public Module
                // Check that they haven't been prefixed already.
                if (user->ident[0] == '~')
                        return;
-               
+
                // All invalid usernames are prefixed with a tilde.
                std::string newident(user->ident);
                newident.insert(newident.begin(), '~');
@@ -307,7 +306,7 @@ class ModuleIdent : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for RFC1413 ident lookups", VF_VENDOR);
+               return Version("Allows the usernames (idents) of users to be looked up using the RFC 1413 Identification Protocol.", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -332,7 +331,7 @@ class ModuleIdent : public Module
                        return;
 
                // We don't want to look this up once the user has connected.
-               if (user->registered == REG_ALL)
+               if (user->registered == REG_ALL || user->quitting)
                        return;
 
                ConfigTag* tag = user->MyClass->config;
@@ -411,7 +410,11 @@ class ModuleIdent : public Module
        ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
        {
                if (myclass->config->getBool("requireident") && state.get(user) != IDENT_FOUND)
+               {
+                       ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires an identd response",
+                               myclass->GetName().c_str());
                        return MOD_RES_DENY;
+               }
                return MOD_RES_PASSTHRU;
        }