kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

[user/henk/code/inspircd.git] / src / cmd_nick.cpp

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index f977deddd73f582d2b17c9a42e35df43e8ff585f..b767bc32b4fc7ed543909540117a8009936c2eda 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -23,7 +23,6 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "dnsqueue.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
@@ -103,7 +102,7 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        return;
                }
        }
-       if ((isnick(parameters[0]) == 0) && (IS_lOCAL(user)))
+       if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user)))
        {
                WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
                return;
@@ -149,20 +148,9 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                }
                else
                {
-#ifdef THREADED_DNS
-                       // initialize their dns lookup thread
-                       pthread_attr_t attribs;
-                       pthread_attr_init(&attribs);
-                       pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_DETACHED);
-                       if (pthread_create(&user->dnsthread, &attribs, dns_task, (void *)user) != 0)
-                       {
-                               log(DEBUG,"Failed to create DNS lookup thread for user %s: %s",user->nick, strerror(errno));
-                       }
-#else
-                       user->dns_done = (!lookup_dns(user->nick));
+                       user->StartDNSLookup();
                        if (user->dns_done)
                                log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
-#endif
                }
        }
        if (user->registered == REG_NICKUSER)