Tidy up strlens which are not required

[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 a92249f84bb8104ef7edf7d85c7f3379705095a4..040e856d4d710542fcc6e98c43d836da8e7e7cbf 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -52,14 +52,13 @@ class RFC1413 : public InspSocket
                // so we just display a notice, and tidy off the ident_data.
                if (u && (Instance->SE->GetRef(ufd) == u))
                {
-            char *newident;
-            
+                       char newident[MAXBUF];
                        u->Shrink("ident_data");
                        u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using ~"+std::string(u->ident)+" instead.");
-                   strcpy(newident,"~");
-            strlcat(newident,u->ident,IDENTMAX);
-            strlcpy(u->ident,newident,IDENTMAX);
-        }
+                       strcpy(newident,"~");
+                       strlcat(newident,u->ident,IDENTMAX);
+                       strlcpy(u->ident,newident,IDENTMAX);
+               }
        }
 
        virtual bool OnDataReady()
@@ -222,7 +221,14 @@ class ModuleIdent : public Module
                        user->Extend("ident_data", (char*)ident);
                }
                else
+               {
+                       char newident[MAXBUF];
+                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using ~"+std::string(user->ident)+" instead.");
+                       strcpy(newident,"~");
+                       strlcat(newident,user->ident,IDENTMAX);
+                       strlcpy(user->ident,newident,IDENTMAX);
                        delete ident;
+               }
        }
 
        virtual bool OnCheckReady(userrec* user)