From afb4c7bebe8ebbbfdbcc9da50f0d8f0cc2b64202 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 12 Jul 2015 20:02:00 +0200 Subject: [PATCH] Rip out remainder of HOOKTYPE_GUEST. Whoops.. were not sending "nick in use" errors (bug caused a few hours ago) --- include/modules.h | 1 - src/modules/m_nick.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/include/modules.h b/include/modules.h index a030a7a0d..0a82cd03c 100644 --- a/include/modules.h +++ b/include/modules.h @@ -694,7 +694,6 @@ extern char *moddata_client_get(aClient *acptr, char *varname); #define HOOKTYPE_REHASH 7 #define HOOKTYPE_PRE_LOCAL_CONNECT 8 #define HOOKTYPE_PRE_LOCAL_QUIT 9 -#define HOOKTYPE_GUEST 10 #define HOOKTYPE_SERVER_CONNECT 11 #define HOOKTYPE_SERVER_QUIT 12 #define HOOKTYPE_STATS 13 diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c index 26499e02b..144bc9965 100644 --- a/src/modules/m_nick.c +++ b/src/modules/m_nick.c @@ -505,11 +505,6 @@ DLLFUNC CMD_FUNC(m_nick) { if (MyConnect(sptr)) { - if (IsUnknown(sptr)) - { - RunHook4(HOOKTYPE_GUEST, cptr, sptr, parc, parv); - return 0; - } sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), me.name, *sptr->name ? sptr->name : "*", nick); return 0; /* NICK message ignored */ @@ -680,11 +675,6 @@ DLLFUNC CMD_FUNC(m_nick) ** NICK is coming from local client connection. Just ** send error reply and ignore the command. */ - if (IsUnknown(sptr)) - { - RunHook4(HOOKTYPE_GUEST, cptr, sptr, parc, parv); - return 0; - } sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), me.name, *sptr->name ? sptr->name : "*", nick); return 0; /* NICK message ignored */