Remove unneccessary temp value which caused a win32 problem by using uint32_t type.

[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 a9ea8c06e5bc750a53f2889ae5cd181fe218d175..3eded4daf59e2eb7a21eb59076d8c6647a05bfb3 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -40,7 +40,7 @@
  * Using this framework we have a much more stable module.
  *
  * A few things to note:
- * 
+ *
  *   O  The only place that may *delete* an active or inactive
  *      ident socket is OnUserDisconnect in the module class.
  *      Because this is out of scope of the socket class there is
@@ -49,7 +49,7 @@
  *
  *   O  Closure of the ident socket with the Close() method will
  *      not cause removal of the socket from memory or detatchment
- *      from its 'parent' User class. It will only flag it as an 
+ *      from its 'parent' User class. It will only flag it as an
  *      inactive socket in the socket engine.
  *
  *   O  Timeouts are handled in OnCheckReaady at the same time as
@@ -106,7 +106,7 @@ class IdentRequestSocket : public EventHandler
                /* We allocate two of these because sizeof(sockaddr_in6) > sizeof(sockaddr_in) */
                sockaddr* s = new sockaddr[2];
                sockaddr* addr = new sockaddr[2];
-       
+
 #ifdef IPV6
                /* Horrid icky nasty ugly berkely socket crap. */
                if (v6)
@@ -208,7 +208,7 @@ class IdentRequestSocket : public EventHandler
                #else
                int req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.sin6_port), ntohs(laddr.sin6_port));
                #endif
-               
+
                /* Send failed if we didnt write the whole ident request --
                 * might as well give up if this happens!
                 */
@@ -296,11 +296,11 @@ class IdentRequestSocket : public EventHandler
                        if (i < 3)
                                continue;
 
-                       char ident[IDENTMAX + 2];
+                       std::string ident;
 
                        /* Truncate the ident at any characters we don't like, skip leading spaces */
-                       int k = 0;
-                       for (const char *j = token.c_str(); *j && (k < IDENTMAX + 1); j++)
+                       size_t k = 0;
+                       for (const char *j = token.c_str(); *j && (k < ServerInstance->Config->Limits.IdentMax + 1); j++)
                        {
                                if (*j == ' ')
                                        continue;
@@ -308,17 +308,15 @@ class IdentRequestSocket : public EventHandler
                                /* Rules taken from InspIRCd::IsIdent */
                                if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.'))
                                {
-                                       ident[k++] = *j;
+                                       ident += *j;
                                        continue;
                                }
 
                                break;
                        }
 
-                       ident[k] = '\0';
-
                        /* Re-check with IsIdent, in case that changes and this doesn't (paranoia!) */
-                       if (*ident && ServerInstance->IsIdent(ident))
+                       if (!ident.empty() && ServerInstance->IsIdent(ident.c_str()))
                        {
                                result = ident;
                        }
@@ -347,29 +345,29 @@ class ModuleIdent : public Module
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect };
                ServerInstance->Modules->Attach(eventlist, this, 5);
        }
-       
+
        virtual Version GetVersion()
        {
                return Version(1, 2, 1, 0, VF_VENDOR, API_VERSION);
        }
-       
-       
+
+
        virtual void OnRehash(User *user, const std::string &param)
        {
                ConfigReader MyConf(ServerInstance);
-               
+
                RequestTimeout = MyConf.ReadInteger("ident", "timeout", 0, true);
                if (!RequestTimeout)
                        RequestTimeout = 5;
        }
-       
+
        virtual int OnUserRegister(User *user)
        {
                /* User::ident is currently the username field from USER; with m_ident loaded, that
-                * should be preceded by a ~. The field is actually IDENTMAX+2 characters wide. */
-               if (user->ident.length() > IDENTMAX + 1)
-                       user->ident.assign(user->ident, 0, IDENTMAX);
-               user->ident.insert('~', 0);
+                * should be preceded by a ~. The field is actually IdentMax+2 characters wide. */
+               if (user->ident.length() > ServerInstance->Config->Limits.IdentMax + 1)
+                       user->ident.assign(user->ident, 0, ServerInstance->Config->Limits.IdentMax);
+               user->ident.insert(0, "~");
 
                user->WriteServ("NOTICE Auth :*** Looking up your ident...");
 
@@ -457,7 +455,7 @@ class ModuleIdent : public Module
                        user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", isock->GetResult());
 
                /* Copy the ident string to the user */
-               user->ident.assign(isock->GetResult(), 0, IDENTMAX+1);
+               user->ident.assign(isock->GetResult(), 0, ServerInstance->Config->Limits.IdentMax + 1);
 
                /* The user isnt actually disconnecting, we call this to clean up the user */
                OnUserDisconnect(user);