From 9d34bfef27863bf5dfedd4cdcc2ab46686015ce4 Mon Sep 17 00:00:00 2001 From: Valery Yatsko Date: Sun, 20 Apr 2008 11:26:48 +0400 Subject: [PATCH] Patch removed --- patches/remote-dlines.diff | 483 ------------------------------------- 1 file changed, 483 deletions(-) delete mode 100644 patches/remote-dlines.diff diff --git a/patches/remote-dlines.diff b/patches/remote-dlines.diff deleted file mode 100644 index 7457f49..0000000 --- a/patches/remote-dlines.diff +++ /dev/null @@ -1,483 +0,0 @@ -diff -r a9a4e710ca64 include/s_newconf.h ---- a/include/s_newconf.h Sun Apr 20 01:03:54 2008 -0500 -+++ b/include/s_newconf.h Sun Apr 20 11:13:46 2008 +0400 -@@ -95,10 +95,14 @@ - #define SHARED_PRESV 0x0100 - #define SHARED_UNRESV 0x0200 - #define SHARED_REHASH 0x0400 -+#define SHARED_TDLINE 0x0800 -+#define SHARED_PDLINE 0x1000 -+#define SHARED_UNDLINE 0x2000 - - #define SHARED_ALL (SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\ - SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\ -- SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV) -+ SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV |\ -+ SHARED_TDLINE | SHARED_PDLINE | SHARED_UNDLINE) - #define CLUSTER_ALL (SHARED_ALL | SHARED_LOCOPS) - - /* flags used in hub/leaf */ -diff -r a9a4e710ca64 modules/m_dline.c ---- a/modules/m_dline.c Sun Apr 20 01:03:54 2008 -0500 -+++ b/modules/m_dline.c Sun Apr 20 11:13:46 2008 +0400 -@@ -44,15 +44,17 @@ - #include "modules.h" - - static int mo_dline(struct Client *, struct Client *, int, const char **); -+static int me_dline(struct Client *, struct Client *, int, const char **); - static int mo_undline(struct Client *, struct Client *, int, const char **); -+static int me_undline(struct Client *, struct Client *, int, const char **); - - struct Message dline_msgtab = { - "DLINE", 0, 0, 0, MFLG_SLOW, -- {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_dline, 2}} -+ {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_dline, 3}, {mo_dline, 2}} - }; - struct Message undline_msgtab = { - "UNDLINE", 0, 0, 0, MFLG_SLOW, -- {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_undline, 2}} -+ {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_undline, 1}, {mo_undline, 2}} - }; - - mapi_clist_av1 dline_clist[] = { &dline_msgtab, &undline_msgtab, NULL }; -@@ -61,6 +63,8 @@ - static int valid_comment(char *comment); - static int flush_write(struct Client *, FILE *, char *, char *); - static int remove_temp_dline(struct ConfItem *); -+static int apply_dline(struct Client *, const char *, int, char *); -+static int apply_undline(struct Client *, const char *); - - /* mo_dline() - * -@@ -73,15 +77,10 @@ - { - char def[] = "No Reason"; - const char *dlhost; -- char *oper_reason; - char *reason = def; -- struct rb_sockaddr_storage daddr; - char cidr_form_host[HOSTLEN + 1]; -- struct ConfItem *aconf; -- int bits; -- char dlbuffer[IRCD_BUFSIZE]; -- const char *current_date; - int tdline_time = 0; -+ const char *target_server = NULL; - int loc = 1; - - if(!IsOperK(source_p)) -@@ -94,72 +93,178 @@ - if((tdline_time = valid_temp_time(parv[loc])) >= 0) - loc++; - -- if(parc < loc + 1) -- { -- sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), -- me.name, source_p->name, "DLINE"); -- return 0; -- } -- - dlhost = parv[loc]; - rb_strlcpy(cidr_form_host, dlhost, sizeof(cidr_form_host)); - -- if(!parse_netmask(dlhost, NULL, &bits)) -+ loc++; -+ -+ if(parc >= loc+2 && !irccmp(parv[loc], "ON")) -+ { -+ target_server = parv[loc+1]; -+ loc += 2; -+ } -+ -+ if(parc >= loc + 1 && !EmptyString(parv[loc])) -+ reason = LOCAL_COPY(parv[loc]); -+ -+ if(target_server != NULL) -+ { -+ sendto_match_servs(source_p, target_server, -+ CAP_ENCAP, NOCAPS, -+ "ENCAP %s DLINE %d %s :%s", -+ target_server, tdline_time, dlhost, reason); -+ -+ if(!match(target_server, me.name)) -+ return 0; -+ } -+ -+ apply_dline(source_p, dlhost, tdline_time, reason); -+ -+ check_dlines(); -+ return 0; -+} -+ -+/* mo_undline() -+ * -+ * parv[1] = dline to remove -+ */ -+static int -+mo_undline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) -+{ -+ const char *cidr; -+ const char *target_server = NULL; -+ -+ if(!IsOperK(source_p)) -+ { -+ sendto_one(source_p, form_str(ERR_NOPRIVS), -+ me.name, source_p->name, "unkline"); -+ return 0; -+ } -+ -+ cidr = parv[1]; -+ -+ if(parc >= 4 && !irccmp(parv[2], "ON")) -+ { -+ target_server = parv[3]; -+ sendto_match_servs(source_p, target_server, -+ CAP_ENCAP, NOCAPS, -+ "ENCAP %s UNDLINE %s", -+ target_server, cidr); -+ -+ if(!match(target_server, me.name)) -+ return 0; -+ } -+ -+ apply_undline(source_p, cidr); -+ -+ return 0; -+} -+ -+static int -+me_dline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) -+{ -+ int tdline_time = atoi(parv[1]); -+ /* Since this is coming over a server link, assume that the originating -+ * server did the relevant permission/sanity checks... -+ */ -+ -+ if(!IsPerson(source_p)) -+ return 0; -+ -+ if(!find_shared_conf(source_p->username, source_p->host, -+ source_p->servptr->name, tdline_time > 0 ? SHARED_TDLINE : SHARED_PDLINE)) -+ { -+ sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "undline failed %s %s %s", -+ source_p->name, parv[1], parv[2]); -+ return 0; -+ } -+ -+ apply_dline(source_p, parv[2], tdline_time, LOCAL_COPY(parv[3])); -+ -+ check_dlines(); -+ return 0; -+} -+ -+static int -+me_undline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) -+{ -+ if(!IsPerson(source_p)) -+ return 0; -+ -+ if(!find_shared_conf(source_p->username, source_p->host, -+ source_p->servptr->name, SHARED_UNDLINE)) -+ return 0; -+ -+ apply_undline(source_p, parv[1]); -+ -+ return 0; -+} -+ -+static int -+apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *reason) -+{ -+ struct ConfItem *aconf; -+ char *oper_reason; -+ char dlbuffer[IRCD_BUFSIZE]; -+ const char *current_date; -+ struct rb_sockaddr_storage daddr; -+ int t = AF_INET, ty, b; -+ const char *creason; -+ -+ ty = parse_netmask(dlhost, (struct sockaddr *)&daddr, &b); -+ if(ty == HM_HOST) - { - sendto_one(source_p, ":%s NOTICE %s :Invalid D-Line", - me.name, source_p->name); - return 0; - } -+#ifdef RB_IPV6 -+ if(ty == HM_IPV6) -+ t = AF_INET6; -+ else -+#endif -+ t = AF_INET; - -- loc++; -- -- if(parc >= loc + 1) /* host :reason */ -- { -- if(!EmptyString(parv[loc])) -- reason = LOCAL_COPY(parv[loc]); -- -- if(!valid_comment(reason)) -- { -- sendto_one(source_p, -- ":%s NOTICE %s :Invalid character '\"' in comment", -- me.name, source_p->name); -- return 0; -- } -- } -- -+ /* This means dlines wider than /16 cannot be set remotely */ - if(IsOperAdmin(source_p)) - { -- if(bits < 8) -+ if(b < 8) - { -- sendto_one(source_p, -- ":%s NOTICE %s :For safety, bitmasks less than 8 require conf access.", -- me.name, parv[0]); -+ sendto_one_notice(source_p, -+ ":For safety, bitmasks less than 8 require conf access."); - return 0; - } - } - else - { -- if(bits < 16) -+ if(b < 16) - { -- sendto_one(source_p, -- ":%s NOTICE %s :Dline bitmasks less than 16 are for admins only.", -- me.name, parv[0]); -+ sendto_one_notice(source_p, -+ ":Dline bitmasks less than 16 are for admins only."); - return 0; - } - } - -+ if(!valid_comment(reason)) -+ { -+ sendto_one(source_p, -+ ":%s NOTICE %s :Invalid character '\"' in comment", -+ me.name, source_p->name); -+ return 0; -+ } -+ -+ /* Look for an oper reason */ -+ if((oper_reason = strchr(reason, '|')) != NULL) -+ { -+ *oper_reason = '\0'; -+ oper_reason++; -+ -+ if(!EmptyString(oper_reason)) -+ aconf->spasswd = rb_strdup(oper_reason); -+ } -+ - if(ConfigFileEntry.non_redundant_klines) - { -- const char *creason; -- int t = AF_INET, ty, b; -- ty = parse_netmask(dlhost, (struct sockaddr *)&daddr, &b); --#ifdef RB_IPV6 -- if(ty == HM_IPV6) -- t = AF_INET6; -- else --#endif -- t = AF_INET; -- - if((aconf = find_dline((struct sockaddr *)&daddr, t)) != NULL) - { - int bx; -@@ -170,11 +275,11 @@ - if(IsConfExemptKline(aconf)) - sendto_one(source_p, - ":%s NOTICE %s :[%s] is (E)d-lined by [%s] - %s", -- me.name, parv[0], dlhost, aconf->host, creason); -+ me.name, source_p->name, dlhost, aconf->host, creason); - else - sendto_one(source_p, - ":%s NOTICE %s :[%s] already D-lined by [%s] - %s", -- me.name, parv[0], dlhost, aconf->host, creason); -+ me.name, source_p->name, dlhost, aconf->host, creason); - return 0; - } - } -@@ -187,16 +292,6 @@ - aconf->status = CONF_DLINE; - aconf->host = rb_strdup(dlhost); - -- /* Look for an oper reason */ -- if((oper_reason = strchr(reason, '|')) != NULL) -- { -- *oper_reason = '\0'; -- oper_reason++; -- -- if(!EmptyString(oper_reason)) -- aconf->spasswd = rb_strdup(oper_reason); -- } -- - if(tdline_time > 0) - { - rb_snprintf(dlbuffer, sizeof(dlbuffer), -@@ -208,7 +303,7 @@ - - if(EmptyString(oper_reason)) - { -- sendto_realops_snomask(SNO_GENERAL, L_ALL, -+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, - "%s added temporary %d min. D-Line for [%s] [%s]", - get_oper_name(source_p), tdline_time / 60, - aconf->host, reason); -@@ -218,7 +313,7 @@ - } - else - { -- sendto_realops_snomask(SNO_GENERAL, L_ALL, -+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, - "%s added temporary %d min. D-Line for [%s] [%s|%s]", - get_oper_name(source_p), tdline_time / 60, - aconf->host, reason, oper_reason); -@@ -239,42 +334,27 @@ - oper_reason, current_date, 0); - } - -- check_dlines(); - return 0; - } - --/* mo_undline() -- * -- * parv[1] = dline to remove -- */ - static int --mo_undline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) -+apply_undline(struct Client *source_p, const char *cidr) - { - FILE *in; - FILE *out; - char buf[BUFSIZE], buff[BUFSIZE], temppath[BUFSIZE], *p; - const char *filename, *found_cidr; -- const char *cidr; -- struct ConfItem *aconf; - int pairme = NO, error_on_write = NO; - mode_t oldumask; -- -- rb_snprintf(temppath, sizeof(temppath), "%s.tmp", ConfigFileEntry.dlinefile); -- -- if(!IsOperUnkline(source_p)) -- { -- sendto_one(source_p, form_str(ERR_NOPRIVS), -- me.name, source_p->name, "unkline"); -- return 0; -- } -- -- cidr = parv[1]; -+ struct ConfItem *aconf; - - if(parse_netmask(cidr, NULL, NULL) == HM_HOST) - { - sendto_one_notice(source_p, ":Invalid D-Line"); - return 0; - } -+ -+ rb_snprintf(temppath, sizeof(temppath), "%s.tmp", ConfigFileEntry.dlinefile); - - aconf = find_exact_conf_by_address(cidr, CONF_DLINE, NULL); - if(aconf == NULL) -@@ -288,7 +368,7 @@ - { - sendto_one(source_p, - ":%s NOTICE %s :Un-dlined [%s] from temporary D-lines", -- me.name, parv[0], buf); -+ me.name, source_p->name, buf); - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "%s has removed the temporary D-Line for: [%s]", - get_oper_name(source_p), buf); -@@ -300,14 +380,14 @@ - - if((in = fopen(filename, "r")) == 0) - { -- sendto_one(source_p, ":%s NOTICE %s :Cannot open %s", me.name, parv[0], filename); -+ sendto_one(source_p, ":%s NOTICE %s :Cannot open %s", me.name, source_p->name, filename); - return 0; - } - - oldumask = umask(0); - if((out = fopen(temppath, "w")) == 0) - { -- sendto_one(source_p, ":%s NOTICE %s :Cannot open %s", me.name, parv[0], temppath); -+ sendto_one(source_p, ":%s NOTICE %s :Cannot open %s", me.name, source_p->name, temppath); - fclose(in); - umask(oldumask); - return 0; -@@ -336,7 +416,7 @@ - continue; - } - -- if(irccmp(found_cidr, aconf->host) == 0) -+ if(irccmp(found_cidr, cidr) == 0) - { - pairme++; - } -@@ -356,13 +436,13 @@ - { - sendto_one(source_p, - ":%s NOTICE %s :Couldn't write D-line file, aborted", -- me.name, parv[0]); -+ me.name, source_p->name); - return 0; - } - else if(!pairme) - { -- sendto_one_notice(source_p, ":Cannot find D-Line for %s in file", -- aconf->host); -+ sendto_one(source_p, ":%s NOTICE %s :No D-Line for %s", -+ me.name, source_p->name, cidr); - - if(temppath != NULL) - (void) unlink(temppath); -@@ -375,13 +455,13 @@ - sendto_one_notice(source_p, ":Couldn't rename temp file, aborted"); - return 0; - } -+ rehash_bans(0); - -- sendto_one(source_p, ":%s NOTICE %s :D-Line for [%s] is removed", me.name, parv[0], aconf->host); -- sendto_realops_snomask(SNO_GENERAL, L_ALL, -- "%s has removed the D-Line for: [%s]", get_oper_name(source_p), aconf->host); -- ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), aconf->host); - -- delete_one_address_conf(aconf->host, aconf); -+ sendto_one(source_p, ":%s NOTICE %s :D-Line for [%s] is removed", me.name, source_p->name, cidr); -+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, -+ "%s has removed the D-Line for: [%s]", get_oper_name(source_p), cidr); -+ ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), cidr); - - return 0; - } -diff -r a9a4e710ca64 modules/m_stats.c ---- a/modules/m_stats.c Sun Apr 20 01:03:54 2008 -0500 -+++ b/modules/m_stats.c Sun Apr 20 11:13:46 2008 +0400 -@@ -951,6 +951,9 @@ - { SHARED_UNRESV, 'R' }, - { SHARED_LOCOPS, 'L' }, - { SHARED_REHASH, 'H' }, -+ { SHARED_TDLINE, 'd' }, -+ { SHARED_PDLINE, 'D' }, -+ { SHARED_UNDLINE, 'E' }, - { 0, '\0'} - }; - -diff -r a9a4e710ca64 src/newconf.c ---- a/src/newconf.c Sun Apr 20 01:03:54 2008 -0500 -+++ b/src/newconf.c Sun Apr 20 11:13:46 2008 +0400 -@@ -373,6 +373,10 @@ - { "kline", SHARED_PKLINE|SHARED_TKLINE }, - { "xline", SHARED_PXLINE|SHARED_TXLINE }, - { "resv", SHARED_PRESV|SHARED_TRESV }, -+ { "dline", SHARED_PDLINE|SHARED_TDLINE }, -+ { "tdline", SHARED_TDLINE }, -+ { "pdline", SHARED_PDLINE }, -+ { "undline", SHARED_UNDLINE }, - { "tkline", SHARED_TKLINE }, - { "unkline", SHARED_UNKLINE }, - { "txline", SHARED_TXLINE },