From d5a432fa0092f39dbb517b5665f35dc87e5a88f7 Mon Sep 17 00:00:00 2001 From: Valery Yatsko Date: Fri, 11 Apr 2008 18:47:03 +0400 Subject: [PATCH] Removing glines --- TODO | 3 +- doc/example.conf | 8 +- doc/logfiles.txt | 8 - doc/reference.conf | 19 +- doc/server-version-info | 4 - doc/sgml/oper-guide/commands.sgml | 66 --- doc/sgml/oper-guide/config.sgml | 12 - doc/sgml/oper-guide/oprivs.sgml | 11 +- doc/technical/capab.txt | 1 - extensions/m_webirc.c | 5 +- extensions/sno_globalkline.c | 2 +- help/opers/gline | 11 - help/opers/index | 35 +- help/opers/rehash | 2 - help/opers/ungline | 8 - include/client.h | 8 +- include/hostmask.h | 4 - include/ircd_defs.h | 2 +- include/logger.h | 1 - include/s_conf.h | 8 - include/s_gline.h | 73 --- include/s_newconf.h | 4 +- include/s_serv.h | 1 - modules/Makefile.in | 1 - modules/m_gline.c | 730 ------------------------------ modules/m_info.c | 30 -- modules/m_privs.c | 2 - modules/m_rehash.c | 42 -- modules/m_stats.c | 88 ---- modules/m_testline.c | 10 - modules/m_testmask.c | 2 +- modules/m_version.c | 4 - src/Makefile.in | 1 - src/client.c | 79 +--- src/hostmask.c | 11 - src/ircd.c | 3 - src/logger.c | 2 - src/newconf.c | 7 - src/s_conf.c | 18 - src/s_gline.c | 163 ------- src/s_newconf.c | 1 - src/s_user.c | 9 - tools/convertilines.c | 7 - 43 files changed, 31 insertions(+), 1475 deletions(-) delete mode 100644 help/opers/gline delete mode 100644 help/opers/ungline delete mode 100644 include/s_gline.h delete mode 100644 modules/m_gline.c delete mode 100644 src/s_gline.c diff --git a/TODO b/TODO index 93978c9..0f9db1c 100644 --- a/TODO +++ b/TODO @@ -33,11 +33,10 @@ this will help us making support for native characters sets/slashes in host etc [F] auth checker module [F] resolver module -[ ] Remove glines entirely +[x] Remove glines entirely [ ] other stuff [?] internally split out +o/+v "ranks" into a series of permissions. this could allow for configure-defined special access levels, halfops, etc. (would need to match globally, somehow. extra SVINFO param?) [?] somehow hide channel operators like ircnet can do? [x] merge m_join.c and m_sjoin.c in one module (same functions, done in ratbox3) - [ ] merge s_gline.c and m_gline.c in one module (for pretty look, done in ratbox3) [x] create chmode.h and put there all declarations of chm_* - this will make some modules clean diff --git a/doc/example.conf b/doc/example.conf index 42c079e..5e02e0d 100755 --- a/doc/example.conf +++ b/doc/example.conf @@ -81,7 +81,6 @@ log { fname_operlog = "logs/operlog"; #fname_foperlog = "logs/foperlog"; fname_serverlog = "logs/serverlog"; - fname_glinelog = "logs/glinelog"; #fname_klinelog = "logs/klinelog"; fname_killlog = "logs/killlog"; fname_operspylog = "logs/operspylog"; @@ -164,7 +163,6 @@ auth { * exceed_limit (old > flag) | allow user to exceed class user limits * kline_exempt (old ^ flag) | exempt this user from k/g/xlines&dnsbls * dnsbl_exempt | exempt this user from dnsbls - * gline_exempt (old _ flag) | exempt this user from glines * spambot_exempt | exempt this user from spambot checks * shide_exempt | exempt this user from serverhiding * jupe_exempt | exempt this user from generating @@ -234,7 +232,6 @@ operator "god" { * remote: allows remote SQUIT and CONNECT (OLD 'R' flag) * kline: allows KLINE and DLINE (OLD 'K' flag) * unkline: allows UNKLINE and UNDLINE (OLD 'U' flag) - * gline: allows GLINE (OLD 'G' flag) * nick_changes: allows oper to see nickchanges (OLD 'N' flag) * via snomask +n * rehash: allows oper to REHASH config (OLD 'H' flag) @@ -254,7 +251,7 @@ operator "god" { * remoteban: allows remote kline etc [DEFAULT] * mass_notice: allows sending wallops and mass notices [DEFAULT] */ - flags = global_kill, remote, kline, unkline, gline, + flags = global_kill, remote, kline, unkline, die, rehash, admin, xline, operwall; }; @@ -452,9 +449,6 @@ general { connect_timeout = 30 seconds; disable_auth = no; no_oper_flood = yes; - glines = no; - gline_time = 1 day; - gline_min_cidr = 16; max_targets = 4; client_flood = 20; use_whois_actually = no; diff --git a/doc/logfiles.txt b/doc/logfiles.txt index 65865f6..a05eae9 100644 --- a/doc/logfiles.txt +++ b/doc/logfiles.txt @@ -13,14 +13,6 @@ Where token is one of: O = remote oper, local target S = server -fname_glinelog --------------- -