Added some missing parameter checking in m_swhois

[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 3c1106b4d56e22f503a5caf45e006ba41a817f5f..732c2eaee99b186c128f5b521815caa22bdee5cd 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -147,13 +147,9 @@ class RFC1413 : public InspSocket
                        {
                                themlen = sizeof(sockaddr_in6);
                                uslen = sizeof(sockaddr_in6);
-                               success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
                        }
-                       else
-                               success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
-#else
-                       success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
 #endif
+                       success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
                        if (success)
                        {
                                delete[] sock_us;
@@ -167,10 +163,8 @@ class RFC1413 : public InspSocket
                                if (this->u->GetProtocolFamily() == AF_INET6)
                                        snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in6*)sock_them)->sin6_port),ntohs(((sockaddr_in6*)sock_us)->sin6_port));
                                else
-                                       snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
-#else
-                               snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
 #endif
+                               snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
                                this->Write(ident_request);
                                delete[] sock_us;
                                delete[] sock_them;
@@ -329,27 +323,4 @@ class ModuleIdent : public Module
 
 };
 
-class ModuleIdentFactory : public ModuleFactory
-{
- public:
-       ModuleIdentFactory()
-       {
-       }
-
-       ~ModuleIdentFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleIdent(Me);
-       }
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleIdentFactory;
-}
-
+MODULE_INIT(ModuleIdent)