diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf index 9750bd224..a45ad3042 100644 --- a/doc/conf/modules.default.conf +++ b/doc/conf/modules.default.conf @@ -99,9 +99,7 @@ loadmodule "m_tkl"; /* also server-to-server */ loadmodule "m_trace"; loadmodule "m_tsctl"; loadmodule "m_undccdeny"; -loadmodule "m_unkline"; loadmodule "m_unsqline"; -loadmodule "m_unzline"; loadmodule "m_wallops"; // Server-to-server commands diff --git a/makefile.win32 b/makefile.win32 index e044922c1..418a7a1b5 100644 --- a/makefile.win32 +++ b/makefile.win32 @@ -174,7 +174,7 @@ DLL_FILES=SRC/MODULES/M_CHGHOST.DLL SRC/MODULES/M_SDESC.DLL SRC/MODULES/M_SETIDE SRC/MODULES/M_OPER.DLL SRC/MODULES/M_PINGPONG.DLL SRC/MODULES/M_QUIT.DLL \ SRC/MODULES/M_RPING.DLL SRC/MODULES/M_SENDUMODE.DLL \ SRC/MODULES/M_SQLINE.DLL SRC/MODULES/M_KILL.DLL SRC/MODULES/M_TSCTL.DLL \ - SRC/MODULES/M_UNKLINE.DLL SRC/MODULES/M_UNSQLINE.DLL SRC/MODULES/M_UNZLINE.DLL \ + SRC/MODULES/M_UNSQLINE.DLL \ SRC/MODULES/M_WHOIS.DLL SRC/MODULES/M_TKL.DLL SRC/MODULES/M_VHOST.DLL \ SRC/MODULES/M_CYCLE.DLL SRC/MODULES/M_SVSJOIN.DLL SRC/MODULES/M_SVSPART.DLL \ SRC/MODULES/M_SVSLUSERS.DLL SRC/MODULES/M_SVSWATCH.DLL SRC/MODULES/M_SVSSILENCE.DLL \ @@ -587,15 +587,9 @@ src/modules/m_sqline.dll: src/modules/m_sqline.c $(INCLUDES) src/modules/m_tsctl.dll: src/modules/m_tsctl.c $(INCLUDES) $(CC) $(MODCFLAGS) src/modules/m_tsctl.c $(MODLFLAGS) -src/modules/m_unkline.dll: src/modules/m_unkline.c $(INCLUDES) - $(CC) $(MODCFLAGS) src/modules/m_unkline.c $(MODLFLAGS) - src/modules/m_unsqline.dll: src/modules/m_unsqline.c $(INCLUDES) $(CC) $(MODCFLAGS) src/modules/m_unsqline.c $(MODLFLAGS) -src/modules/m_unzline.dll: src/modules/m_unzline.c $(INCLUDES) - $(CC) $(MODCFLAGS) src/modules/m_unzline.c $(MODLFLAGS) - src/modules/m_whois.dll: src/modules/m_whois.c $(INCLUDES) $(CC) $(MODCFLAGS) src/modules/m_whois.c $(MODLFLAGS) diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 0e943ce12..8115dc8e3 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -40,7 +40,7 @@ R_MODULES= \ m_chgname.so m_guest.so m_kill.so \ m_lag.so m_message.so m_oper.so m_pingpong.so \ m_quit.so m_rping.so m_sendumode.so m_sqline.so \ - m_tsctl.so m_unkline.so m_unsqline.so m_unzline.so m_whois.so \ + m_tsctl.so m_unsqline.so m_whois.so \ m_tkl.so m_vhost.so m_cycle.so m_svsjoin.so m_svspart.so \ m_svswatch.so m_svssilence.so m_sendsno.so m_svssno.so \ m_sajoin.so m_sapart.so m_samode.so m_kick.so m_topic.so \ @@ -124,18 +124,10 @@ m_tsctl.so: m_tsctl.c $(INCLUDES) $(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \ -o m_tsctl.so m_tsctl.c -m_unkline.so: m_unkline.c $(INCLUDES) - $(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \ - -o m_unkline.so m_unkline.c - m_unsqline.so: m_unsqline.c $(INCLUDES) $(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \ -o m_unsqline.so m_unsqline.c -m_unzline.so: m_unzline.c $(INCLUDES) - $(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \ - -o m_unzline.so m_unzline.c - m_whois.so: m_whois.c $(INCLUDES) $(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \ -o m_whois.so m_whois.c diff --git a/src/modules/m_unkline.c b/src/modules/m_unkline.c deleted file mode 100644 index b07133fa3..000000000 --- a/src/modules/m_unkline.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Unreal Internet Relay Chat Daemon, src/modules/m_unkline.c - * (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team - * Moved to modules by Fish (Justin Hammond) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 1, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include "config.h" -#include "struct.h" -#include "common.h" -#include "sys.h" -#include "numeric.h" -#include "msg.h" -#include "channel.h" -#include -#include -#include -#include -#include -#ifdef _WIN32 -#include -#endif -#include -#include "h.h" -#include "proto.h" -#ifdef _WIN32 -#include "version.h" -#endif - -DLLFUNC int m_unkline(aClient *cptr, aClient *sptr, int parc, char *parv[]); - -/* Place includes here */ -#define MSG_UNKLINE "UNKLINE" /* UNKLINE */ - -ModuleHeader MOD_HEADER(m_unkline) - = { - "unkline", /* Name of module */ - "$Id$", /* Version */ - "command /unkline", /* Short description of module */ - "3.2-b8-1", - NULL - }; - -/* This is called on module init, before Server Ready */ -MOD_INIT(m_unkline) -{ - CommandAdd(modinfo->handle, MSG_UNKLINE, m_unkline, MAXPARA, 0); - MARK_AS_OFFICIAL_MODULE(modinfo); - return MOD_SUCCESS; -} - -/* Is first run when server is 100% ready */ -MOD_LOAD(m_unkline) -{ - return MOD_SUCCESS; -} - -/* Called when module is unloaded */ -MOD_UNLOAD(m_unkline) -{ - return MOD_SUCCESS; -} - -/* - * m_unkline - * parv[1] = userhost - */ - -DLLFUNC int m_unkline(aClient *cptr, aClient *sptr, int parc, char *parv[]) -{ - if (!MyClient(sptr) || !ValidatePermissionsForPath("tkl:kline:remove",sptr,NULL,NULL,NULL)) - { - sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name); - return 0; - } - sendto_one(sptr, ":%s NOTICE %s :Please use /kline -user@host", me.name, sptr->name); - - return 0; -} diff --git a/src/modules/m_unzline.c b/src/modules/m_unzline.c deleted file mode 100644 index fbea2d156..000000000 --- a/src/modules/m_unzline.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Unreal Internet Relay Chat Daemon, src/modules/m_unzline.c - * (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team - * Moved to modules by Fish (Justin Hammond) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 1, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include "config.h" -#include "struct.h" -#include "common.h" -#include "sys.h" -#include "numeric.h" -#include "msg.h" -#include "channel.h" -#include -#include -#include -#include -#include -#ifdef _WIN32 -#include -#endif -#include -#include "h.h" -#include "proto.h" -#ifdef _WIN32 -#include "version.h" -#endif - -DLLFUNC int m_unzline(aClient *cptr, aClient *sptr, int parc, char *parv[]); - -/* Place includes here */ -#define MSG_UNZLINE "UNZLINE" /* UNZLINE */ - -ModuleHeader MOD_HEADER(m_unzline) - = { - "unzline", /* Name of module */ - "$Id$", /* Version */ - "command /unzline", /* Short description of module */ - "3.2-b8-1", - NULL - }; - -/* This is called on module init, before Server Ready */ -MOD_INIT(m_unzline) -{ - CommandAdd(modinfo->handle, MSG_UNZLINE, m_unzline, MAXPARA, 0); - MARK_AS_OFFICIAL_MODULE(modinfo); - return MOD_SUCCESS; -} - -/* Is first run when server is 100% ready */ -MOD_LOAD(m_unzline) -{ - return MOD_SUCCESS; -} - -/* Called when module is unloaded */ -MOD_UNLOAD(m_unzline) -{ - return MOD_SUCCESS; -} - - -/* - * m_unzline remove a temporary zap line - * parv[1] = host - */ - -DLLFUNC int m_unzline(aClient *cptr, aClient *sptr, int parc, char *parv[]) -{ - if (!MyClient(sptr) || !ValidatePermissionsForPath("tkl:zline:local:remove",sptr,NULL,NULL,NULL)) - { - sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name); - return 0; - } - - sendto_one(sptr, ":%s NOTICE %s :Please use /zline -user@host", me.name, sptr->name); - - return 0; -}