From 0ed0a9fe0abee10181a92c10d9fe74d60f4607ac Mon Sep 17 00:00:00 2001 From: Elizabeth Myers Date: Sat, 2 Apr 2016 05:20:30 -0500 Subject: [PATCH] Move m_locops module to extensions. Many networks do not use local ops and therefore should not be required to have this around all the time. --- NEWS.md | 19 ++++++++++++------- doc/ircd.conf.example | 1 + doc/reference.conf | 2 ++ extensions/Makefile.am | 15 ++++++++------- {modules => extensions}/m_locops.c | 0 modules/Makefile.am | 1 - 6 files changed, 23 insertions(+), 15 deletions(-) rename {modules => extensions}/m_locops.c (100%) diff --git a/NEWS.md b/NEWS.md index f6f1ebd79..724055ebc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # News -This is charybdis 3.6-dev, Copyright (c) 2005-2016 Charybdis team. +This is charybdis 4.0-dev, Copyright (c) 2005-2016 Charybdis team. See LICENSE for licensing details (GPL v2). ## charybdis-3.6-dev @@ -36,6 +36,9 @@ See LICENSE for licensing details (GPL v2). - DNS, ident, and blacklist lookups have been moved to a dedicated daemon known as authd. Some cosmetic changes to blacklist statistics and rejection notices have resulted. +- An experimental OPM scanner has been added to authd. Plaintext SOCKS4, + SOCKS5, and HTTP CONNECT proxies can be checked for. +- The LOCOPS command has been moved from core to an extension. ### conf - Add the ability to strip color codes from topics unconditionally. @@ -43,14 +46,16 @@ See LICENSE for licensing details (GPL v2). ### docs - The documentation has been cleaned up; obsolete files have been purged, and - stuff has been renamed and shuffled around to be more consistent. + files have been renamed and shuffled around to be more consistent. ### code -- irc_dictionary and irc_radixtree stuff is now in librb, prefixed accordingly. - Typedefs have been added for consistency reasons. For example, now you would - write `rb_dictionary *foo` and `RB_DICTIONARY_FOREACH`. -- C99 bools have been added. Don't use ints as simple true/false flags anymore. - Accordingly, the `YES`/`NO` and `TRUE`/`FALSE` macros have been removed. +- irc_dictionary and irc_radixtree related functions are now in librb, and + prefixed accordingly. Typedefs have been added for consistency with existing + data structures. For example, now you would write `rb_dictionary *foo` and + `RB_DICTIONARY_FOREACH`. +- C99 bools are now included and used in the code. Don't use ints as simple true + or false flags anymore. In accordance with this change, the `YES`/`NO` and + `TRUE`/`FALSE` macros have been removed. - libratbox has been renamed to librb, as we have diverged from upstream long ago. - Almost all 2.8-style hashtable structures have been moved to dictionaries or diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example index f048d2074..63b6fc654 100644 --- a/doc/ircd.conf.example +++ b/doc/ircd.conf.example @@ -28,6 +28,7 @@ #loadmodule "extensions/m_extendchans"; #loadmodule "extensions/m_findforwards"; #loadmodule "extensions/m_identify"; +#loadmodule "extensions/m_locops"; #loadmodule "extensions/no_oper_invis"; #loadmodule "extensions/sno_farconnect"; #loadmodule "extensions/sno_globalkline"; diff --git a/doc/reference.conf b/doc/reference.conf index 1acc1db40..714366674 100644 --- a/doc/reference.conf +++ b/doc/reference.conf @@ -69,6 +69,7 @@ * Dynamically extend channel limits -- m_extendchans * Find channel forwards -- m_findforwards * /identify support -- m_identify + * /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 @@ -104,6 +105,7 @@ #loadmodule "extensions/m_extendchans"; #loadmodule "extensions/m_findforwards"; #loadmodule "extensions/m_identify"; +#loadmodule "extensions/m_locops"; #loadmodule "extensions/no_oper_invis"; #loadmodule "extensions/sno_farconnect"; #loadmodule "extensions/sno_globalkline"; diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 443c65570..40e5afb27 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -8,12 +8,12 @@ extensiondir=@moduledir@/extensions extension_LTLIBRARIES = \ chm_adminonly.la \ chm_operonly.la \ - chm_operonly_compat.la \ + chm_operonly_compat.la \ chm_insecure.la \ chm_nonotice.la \ chm_operpeace.la \ chm_quietunreg_compat.la \ - chm_sslonly.la \ + chm_sslonly.la \ chm_sslonly_compat.la \ createauthonly.la \ createoperonly.la \ @@ -22,7 +22,7 @@ extension_LTLIBRARIES = \ extb_channel.la \ extb_hostmask.la \ extb_oper.la \ - extb_server.la \ + extb_server.la \ extb_ssl.la \ extb_realname.la \ extb_usermode.la \ @@ -31,7 +31,7 @@ extension_LTLIBRARIES = \ force_user_invis.la \ helpops.la \ hurt.la \ - ip_cloaking.la \ + ip_cloaking.la \ ip_cloaking_old.la \ ip_cloaking_3.0.la \ ip_cloaking_4.0.la \ @@ -44,12 +44,13 @@ extension_LTLIBRARIES = \ sno_globaloper.la \ sno_whois.la \ umode_noctcp.la \ - m_adminwall.la \ + m_adminwall.la \ m_echotags.la \ m_extendchans.la \ m_findforwards.la \ m_identify.la \ - m_mkpasswd.la \ + m_locops.la \ + m_mkpasswd.la \ m_ojoin.la \ m_okick.la \ m_omode.la \ @@ -66,7 +67,7 @@ extension_LTLIBRARIES = \ spy_info_notice.la \ spy_links_notice.la \ spy_motd_notice.la \ - spy_stats_notice.la \ + spy_stats_notice.la \ spy_stats_p_notice.la \ spy_trace_notice.la \ example_module.la diff --git a/modules/m_locops.c b/extensions/m_locops.c similarity index 100% rename from modules/m_locops.c rename to extensions/m_locops.c diff --git a/modules/Makefile.am b/modules/Makefile.am index 8c2fb9df0..21f7aa65d 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -34,7 +34,6 @@ auto_load_mod_LTLIBRARIES = \ m_knock.la \ m_links.la \ m_list.la \ - m_locops.la \ m_lusers.la \ m_map.la \ m_monitor.la \