diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example index a2056925..5d8372af 100644 --- a/doc/ircd.conf.example +++ b/doc/ircd.conf.example @@ -29,7 +29,6 @@ #loadmodule "extensions/m_locops"; #loadmodule "extensions/no_oper_invis"; #loadmodule "extensions/sno_farconnect"; -#loadmodule "extensions/sno_globalkline"; #loadmodule "extensions/sno_globalnickchange"; #loadmodule "extensions/sno_globaloper"; #loadmodule "extensions/override"; diff --git a/doc/reference.conf b/doc/reference.conf index 7d2bc2e7..6b19312a 100644 --- a/doc/reference.conf +++ b/doc/reference.conf @@ -70,7 +70,6 @@ * /locops support -- m_locops * Opers cannot be invisible (umode +i) -- no_oper_invis * Far connection notices (snomask +F) -- sno_farconnect - * Remote k/d/x line active notices -- sno_globalkline * Remote oper up notices -- sno_globaloper * Global nick-change notices -- sno_globalnickchange * /whois notifications (snomask +W) -- sno_whois @@ -104,7 +103,6 @@ #loadmodule "extensions/m_locops"; #loadmodule "extensions/no_oper_invis"; #loadmodule "extensions/sno_farconnect"; -#loadmodule "extensions/sno_globalkline"; #loadmodule "extensions/sno_globalnickchange"; #loadmodule "extensions/sno_globaloper"; #loadmodule "extensions/sno_whois"; diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 83cdd0a7..1d3bcda8 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -43,7 +43,6 @@ extension_LTLIBRARIES = \ restrict-unauthenticated.la \ sno_channelcreate.la \ sno_farconnect.la \ - sno_globalkline.la \ sno_globalnickchange.la \ sno_globaloper.la \ umode_noctcp.la \ diff --git a/extensions/sno_globalkline.c b/extensions/sno_globalkline.c deleted file mode 100644 index 0b3285b2..00000000 --- a/extensions/sno_globalkline.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Shows notices if remote clients exit with "Bad user info" or - * ConfigFileEntry.kline_reason. - * Assumes client_exit is enabled so users can't fake these reasons, - * and kline_reason is enabled and the same everywhere. - * Yes, this is a hack, but it is simple and avoids sending - * more data across servers -- jilles - */ - -#include "stdinc.h" -#include "modules.h" -#include "client.h" -#include "hook.h" -#include "ircd.h" -#include "send.h" -#include "s_conf.h" - -static const char sno_desc[] = - "Adds server notices for global XLINEs, KLINEs, and DLINEs"; - -static void h_gla_client_exit(hook_data_client_exit *); - -mapi_hfn_list_av1 gla_hfnlist[] = { - { "client_exit", (hookfn) h_gla_client_exit }, - { NULL, NULL } -}; - -DECLARE_MODULE_AV2(globallineactive, NULL, NULL, NULL, NULL, gla_hfnlist, NULL, NULL, sno_desc); - -static void -h_gla_client_exit(hook_data_client_exit *hdata) -{ - struct Client *source_p; - - source_p = hdata->target; - - if (MyConnect(source_p) || !IsClient(source_p)) - return; - if (!strcmp(hdata->comment, "Bad user info")) - { - sendto_realops_snomask_from(SNO_GENERAL, L_ALL, source_p->servptr, - "XLINE active for %s[%s@%s]", - source_p->name, source_p->username, source_p->host); - } - else if (ConfigFileEntry.kline_reason != NULL && - !strcmp(hdata->comment, ConfigFileEntry.kline_reason)) - { - sendto_realops_snomask_from(SNO_GENERAL, L_ALL, source_p->servptr, - "K/DLINE active for %s[%s@%s]", - source_p->name, source_p->username, source_p->host); - } - else if (!strncmp(hdata->comment, "Temporary K-line ", 17)) - { - sendto_realops_snomask_from(SNO_GENERAL, L_ALL, source_p->servptr, - "K/DLINE active for %s[%s@%s]", - source_p->name, source_p->username, source_p->host); - } - else if (!strncmp(hdata->comment, "Temporary D-line ", 17)) - { - sendto_realops_snomask_from(SNO_GENERAL, L_ALL, source_p->servptr, - "K/DLINE active for %s[%s@%s]", - source_p->name, source_p->username, source_p->host); - } -} diff --git a/testsuite/ircd.conf.1 b/testsuite/ircd.conf.1 index cb80da7b..5fe7f951 100644 --- a/testsuite/ircd.conf.1 +++ b/testsuite/ircd.conf.1 @@ -5,7 +5,6 @@ loadmodule "extensions/extb_realname.la"; loadmodule "extensions/extb_server.la"; #loadmodule "extensions/ip_cloaking.la"; loadmodule "extensions/sno_farconnect.la"; -loadmodule "extensions/sno_globalkline.la"; #loadmodule "extensions/sno_globaloper.la"; serverinfo { diff --git a/testsuite/ircd.conf.2 b/testsuite/ircd.conf.2 index 7218d9dd..b154bf32 100644 --- a/testsuite/ircd.conf.2 +++ b/testsuite/ircd.conf.2 @@ -5,7 +5,6 @@ loadmodule "extensions/extb_realname.la"; loadmodule "extensions/extb_server.la"; #loadmodule "extensions/ip_cloaking.la"; loadmodule "extensions/sno_farconnect.la"; -loadmodule "extensions/sno_globalkline.la"; #loadmodule "extensions/sno_globaloper.la"; serverinfo { diff --git a/testsuite/ircd.conf.3 b/testsuite/ircd.conf.3 index 24e865fd..9850885c 100644 --- a/testsuite/ircd.conf.3 +++ b/testsuite/ircd.conf.3 @@ -5,7 +5,6 @@ loadmodule "extensions/extb_realname.la"; loadmodule "extensions/extb_server.la"; #loadmodule "extensions/ip_cloaking.la"; loadmodule "extensions/sno_farconnect.la"; -loadmodule "extensions/sno_globalkline.la"; #loadmodule "extensions/sno_globaloper.la"; serverinfo {