2007-01-25 06:40:21 +00:00
|
|
|
/*
|
|
|
|
* ircd-ratbox: A slightly useful ircd.
|
|
|
|
* m_dline.c: Bans/unbans a user.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
|
|
|
* Copyright (C) 1996-2002 Hybrid Development Team
|
|
|
|
* Copyright (C) 2002-2005 ircd-ratbox development team
|
|
|
|
*
|
|
|
|
* 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
|
|
* USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "stdinc.h"
|
|
|
|
#include "channel.h"
|
|
|
|
#include "class.h"
|
|
|
|
#include "client.h"
|
2008-04-20 05:47:38 +00:00
|
|
|
#include "match.h"
|
2007-01-25 06:40:21 +00:00
|
|
|
#include "ircd.h"
|
|
|
|
#include "hostmask.h"
|
|
|
|
#include "numeric.h"
|
|
|
|
#include "s_conf.h"
|
|
|
|
#include "s_newconf.h"
|
2008-04-03 02:52:01 +00:00
|
|
|
#include "logger.h"
|
2007-01-25 06:40:21 +00:00
|
|
|
#include "send.h"
|
|
|
|
#include "hash.h"
|
|
|
|
#include "s_serv.h"
|
|
|
|
#include "msg.h"
|
|
|
|
#include "parse.h"
|
|
|
|
#include "modules.h"
|
2010-01-07 23:19:03 +00:00
|
|
|
#include "bandbi.h"
|
2010-03-01 00:23:22 +00:00
|
|
|
#include "operhash.h"
|
2007-01-25 06:40:21 +00:00
|
|
|
|
2016-03-09 07:29:41 +00:00
|
|
|
static const char dline_desc[] = "Provides the DLINE facility to ban users via IP address";
|
|
|
|
|
2016-03-09 07:37:03 +00:00
|
|
|
static void mo_dline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
|
|
|
|
static void me_dline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
|
|
|
|
static void mo_undline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
|
|
|
|
static void me_undline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
|
2007-01-25 06:40:21 +00:00
|
|
|
|
|
|
|
struct Message dline_msgtab = {
|
2016-02-19 22:42:40 +00:00
|
|
|
"DLINE", 0, 0, 0, 0,
|
2013-09-23 09:34:30 +00:00
|
|
|
{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_dline, 4}, {mo_dline, 2}}
|
2007-01-25 06:40:21 +00:00
|
|
|
};
|
2010-01-07 23:19:03 +00:00
|
|
|
|
2007-01-25 06:40:21 +00:00
|
|
|
struct Message undline_msgtab = {
|
2016-02-19 22:42:40 +00:00
|
|
|
"UNDLINE", 0, 0, 0, 0,
|
2013-09-23 09:34:30 +00:00
|
|
|
{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_undline, 2}, {mo_undline, 2}}
|
2007-01-25 06:40:21 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
mapi_clist_av1 dline_clist[] = { &dline_msgtab, &undline_msgtab, NULL };
|
2010-01-07 23:19:03 +00:00
|
|
|
|
2016-03-07 07:59:08 +00:00
|
|
|
DECLARE_MODULE_AV2(dline, NULL, NULL, dline_clist, NULL, NULL, NULL, NULL, dline_desc);
|
2007-01-25 06:40:21 +00:00
|
|
|
|
2016-03-09 07:37:03 +00:00
|
|
|
static bool remove_temp_dline(struct ConfItem *);
|
|
|
|
static void apply_dline(struct Client *, const char *, int, char *);
|
|
|
|
static void apply_undline(struct Client *, const char *);
|
2007-01-25 06:40:21 +00:00
|
|
|
|
|
|
|
/* mo_dline()
|
2014-03-03 04:25:47 +00:00
|
|
|
*
|
2007-01-25 06:40:21 +00:00
|
|
|
* parv[1] - dline to add
|
|
|
|
* parv[2] - reason
|
|
|
|
*/
|
2016-03-09 07:37:03 +00:00
|
|
|
static void
|
2016-02-11 02:54:17 +00:00
|
|
|
mo_dline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
|
|
|
char def[] = "No Reason";
|
|
|
|
const char *dlhost;
|
|
|
|
char *reason = def;
|
|
|
|
int tdline_time = 0;
|
2008-04-20 07:26:37 +00:00
|
|
|
const char *target_server = NULL;
|
2007-01-25 06:40:21 +00:00
|
|
|
int loc = 1;
|
|
|
|
|
|
|
|
if(!IsOperK(source_p))
|
|
|
|
{
|
2010-01-07 23:19:03 +00:00
|
|
|
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "kline");
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if((tdline_time = valid_temp_time(parv[loc])) >= 0)
|
|
|
|
loc++;
|
|
|
|
|
2020-10-18 18:49:50 +00:00
|
|
|
if (loc >= parc)
|
|
|
|
{
|
|
|
|
sendto_one_notice(source_p, ":Need an IP to D-Line");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-01-25 06:40:21 +00:00
|
|
|
dlhost = parv[loc];
|
2008-04-20 07:26:37 +00:00
|
|
|
loc++;
|
|
|
|
|
2011-06-25 09:34:34 +00:00
|
|
|
/* would break the protocol */
|
|
|
|
if (*dlhost == ':')
|
|
|
|
{
|
2020-07-26 17:17:01 +00:00
|
|
|
sendto_one_notice(source_p, ":Invalid D-Line [%s] - IP cannot start with :", dlhost);
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2011-06-25 09:34:34 +00:00
|
|
|
}
|
|
|
|
|
2020-07-26 16:45:49 +00:00
|
|
|
int ty = parse_netmask_strict(dlhost, NULL, NULL);
|
|
|
|
if (ty != HM_IPV4 && ty != HM_IPV6)
|
|
|
|
{
|
2020-07-26 17:17:01 +00:00
|
|
|
sendto_one_notice(source_p, ":Invalid D-Line [%s] - doesn't look like IP[/cidr]", dlhost);
|
2020-07-26 16:45:49 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-01-07 23:19:03 +00:00
|
|
|
if(parc >= loc + 2 && !irccmp(parv[loc], "ON"))
|
|
|
|
{
|
2008-04-23 16:32:46 +00:00
|
|
|
if(!IsOperRemoteBan(source_p))
|
|
|
|
{
|
|
|
|
sendto_one(source_p, form_str(ERR_NOPRIVS),
|
2010-01-07 23:19:03 +00:00
|
|
|
me.name, source_p->name, "remoteban");
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2008-04-23 16:32:46 +00:00
|
|
|
}
|
|
|
|
|
2010-01-07 23:19:03 +00:00
|
|
|
target_server = parv[loc + 1];
|
2008-04-20 07:26:37 +00:00
|
|
|
loc += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(parc >= loc + 1 && !EmptyString(parv[loc]))
|
|
|
|
reason = LOCAL_COPY(parv[loc]);
|
|
|
|
|
|
|
|
if(target_server != NULL)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2008-04-20 07:26:37 +00:00
|
|
|
sendto_match_servs(source_p, target_server,
|
2010-01-07 23:19:03 +00:00
|
|
|
CAP_ENCAP, NOCAPS,
|
|
|
|
"ENCAP %s DLINE %d %s :%s",
|
|
|
|
target_server, tdline_time, dlhost, reason);
|
2008-04-20 07:26:37 +00:00
|
|
|
|
|
|
|
if(!match(target_server, me.name))
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
|
2008-04-20 07:26:37 +00:00
|
|
|
apply_dline(source_p, dlhost, tdline_time, reason);
|
|
|
|
|
|
|
|
check_dlines();
|
|
|
|
}
|
2007-01-25 06:40:21 +00:00
|
|
|
|
2008-04-20 07:26:37 +00:00
|
|
|
/* mo_undline()
|
|
|
|
*
|
|
|
|
* parv[1] = dline to remove
|
|
|
|
*/
|
2016-03-09 07:37:03 +00:00
|
|
|
static void
|
2016-02-11 02:54:17 +00:00
|
|
|
mo_undline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
|
2008-04-20 07:26:37 +00:00
|
|
|
{
|
|
|
|
const char *cidr;
|
|
|
|
const char *target_server = NULL;
|
|
|
|
|
|
|
|
if(!IsOperK(source_p))
|
|
|
|
{
|
2010-01-07 23:19:03 +00:00
|
|
|
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "unkline");
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2010-01-07 23:19:03 +00:00
|
|
|
}
|
|
|
|
|
2008-04-20 07:26:37 +00:00
|
|
|
cidr = parv[1];
|
|
|
|
|
|
|
|
if(parc >= 4 && !irccmp(parv[2], "ON"))
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2008-04-23 16:32:46 +00:00
|
|
|
if(!IsOperRemoteBan(source_p))
|
|
|
|
{
|
|
|
|
sendto_one(source_p, form_str(ERR_NOPRIVS),
|
2010-01-07 23:19:03 +00:00
|
|
|
me.name, source_p->name, "remoteban");
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2008-04-23 16:32:46 +00:00
|
|
|
}
|
|
|
|
|
2008-04-20 07:26:37 +00:00
|
|
|
target_server = parv[3];
|
|
|
|
sendto_match_servs(source_p, target_server,
|
2010-01-07 23:19:03 +00:00
|
|
|
CAP_ENCAP, NOCAPS, "ENCAP %s UNDLINE %s", target_server, cidr);
|
2007-01-25 06:40:21 +00:00
|
|
|
|
2008-04-20 07:26:37 +00:00
|
|
|
if(!match(target_server, me.name))
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
|
2008-04-20 07:26:37 +00:00
|
|
|
apply_undline(source_p, cidr);
|
|
|
|
}
|
|
|
|
|
2016-03-09 07:37:03 +00:00
|
|
|
static void
|
2016-02-11 02:54:17 +00:00
|
|
|
me_dline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
|
2008-04-20 13:47:53 +00:00
|
|
|
{
|
|
|
|
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))
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2008-04-20 13:47:53 +00:00
|
|
|
|
|
|
|
apply_dline(source_p, parv[2], tdline_time, LOCAL_COPY(parv[3]));
|
|
|
|
|
|
|
|
check_dlines();
|
|
|
|
}
|
|
|
|
|
2016-03-09 07:37:03 +00:00
|
|
|
static void
|
2016-02-11 02:54:17 +00:00
|
|
|
me_undline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
|
2008-04-20 13:47:53 +00:00
|
|
|
{
|
|
|
|
if(!IsPerson(source_p))
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2008-04-20 13:47:53 +00:00
|
|
|
|
|
|
|
apply_undline(source_p, parv[1]);
|
2008-04-20 07:26:37 +00:00
|
|
|
}
|
|
|
|
|
2016-03-09 07:37:03 +00:00
|
|
|
static void
|
2008-04-20 07:26:37 +00:00
|
|
|
apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *reason)
|
|
|
|
{
|
|
|
|
struct ConfItem *aconf;
|
|
|
|
char *oper_reason;
|
|
|
|
struct rb_sockaddr_storage daddr;
|
|
|
|
int t = AF_INET, ty, b;
|
|
|
|
const char *creason;
|
|
|
|
|
2020-07-05 23:45:49 +00:00
|
|
|
ty = parse_netmask_strict(dlhost, &daddr, &b);
|
|
|
|
if(ty != HM_IPV4 && ty != HM_IPV6)
|
2008-04-20 07:26:37 +00:00
|
|
|
{
|
2010-01-07 23:19:03 +00:00
|
|
|
sendto_one(source_p, ":%s NOTICE %s :Invalid D-Line", me.name, source_p->name);
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2008-04-20 07:26:37 +00:00
|
|
|
}
|
|
|
|
if(ty == HM_IPV6)
|
|
|
|
t = AF_INET6;
|
|
|
|
else
|
|
|
|
t = AF_INET;
|
|
|
|
|
|
|
|
/* This means dlines wider than /16 cannot be set remotely */
|
2007-01-25 06:40:21 +00:00
|
|
|
if(IsOperAdmin(source_p))
|
|
|
|
{
|
2008-04-20 07:26:37 +00:00
|
|
|
if(b < 8)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2008-04-20 07:26:37 +00:00
|
|
|
sendto_one_notice(source_p,
|
2010-01-07 23:19:03 +00:00
|
|
|
":For safety, bitmasks less than 8 require conf access.");
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-04-20 07:26:37 +00:00
|
|
|
if(b < 16)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2008-04-20 07:26:37 +00:00
|
|
|
sendto_one_notice(source_p,
|
2010-01-07 23:19:03 +00:00
|
|
|
":Dline bitmasks less than 16 are for admins only.");
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-02 15:37:50 +00:00
|
|
|
if(ConfigFileEntry.non_redundant_klines)
|
|
|
|
{
|
2010-01-07 23:19:03 +00:00
|
|
|
if((aconf = find_dline((struct sockaddr *) &daddr, t)) != NULL)
|
2008-04-02 15:37:50 +00:00
|
|
|
{
|
|
|
|
int bx;
|
2020-07-05 23:45:49 +00:00
|
|
|
int masktype = parse_netmask_strict(aconf->host, NULL, &bx);
|
|
|
|
|
|
|
|
if (masktype != HM_ERROR && b >= bx)
|
2008-04-02 15:37:50 +00:00
|
|
|
{
|
|
|
|
creason = aconf->passwd ? aconf->passwd : "<No Reason>";
|
|
|
|
if(IsConfExemptKline(aconf))
|
|
|
|
sendto_one(source_p,
|
|
|
|
":%s NOTICE %s :[%s] is (E)d-lined by [%s] - %s",
|
2010-01-07 23:19:03 +00:00
|
|
|
me.name, source_p->name, dlhost, aconf->host,
|
|
|
|
creason);
|
2008-04-02 15:37:50 +00:00
|
|
|
else
|
|
|
|
sendto_one(source_p,
|
|
|
|
":%s NOTICE %s :[%s] already D-lined by [%s] - %s",
|
2010-01-07 23:19:03 +00:00
|
|
|
me.name, source_p->name, dlhost, aconf->host,
|
|
|
|
creason);
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2008-04-02 15:37:50 +00:00
|
|
|
}
|
|
|
|
}
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
|
2008-04-03 23:18:47 +00:00
|
|
|
rb_set_time();
|
2007-01-25 06:40:21 +00:00
|
|
|
|
|
|
|
aconf = make_conf();
|
|
|
|
aconf->status = CONF_DLINE;
|
2010-02-27 23:46:56 +00:00
|
|
|
aconf->created = rb_current_time();
|
2008-04-01 23:26:34 +00:00
|
|
|
aconf->host = rb_strdup(dlhost);
|
2010-02-28 15:27:06 +00:00
|
|
|
aconf->passwd = rb_strdup(reason);
|
2010-03-01 00:23:22 +00:00
|
|
|
aconf->info.oper = operhash_add(get_oper_name(source_p));
|
2007-01-25 06:40:21 +00:00
|
|
|
|
2011-12-30 17:29:58 +00:00
|
|
|
if(strlen(reason) > BANREASONLEN)
|
|
|
|
reason[BANREASONLEN] = '\0';
|
|
|
|
|
2008-07-27 10:43:49 +00:00
|
|
|
/* 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);
|
|
|
|
}
|
|
|
|
|
2007-01-25 06:40:21 +00:00
|
|
|
if(tdline_time > 0)
|
|
|
|
{
|
2008-04-01 23:53:20 +00:00
|
|
|
aconf->hold = rb_current_time() + tdline_time;
|
2007-01-25 06:40:21 +00:00
|
|
|
add_temp_dline(aconf);
|
|
|
|
|
|
|
|
if(EmptyString(oper_reason))
|
|
|
|
{
|
2008-04-20 17:43:50 +00:00
|
|
|
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
2010-01-07 23:19:03 +00:00
|
|
|
"%s added temporary %d min. D-Line for [%s] [%s]",
|
|
|
|
get_oper_name(source_p), tdline_time / 60,
|
|
|
|
aconf->host, reason);
|
2007-01-25 06:40:21 +00:00
|
|
|
ilog(L_KLINE, "D %s %d %s %s",
|
2010-01-07 23:19:03 +00:00
|
|
|
get_oper_name(source_p), tdline_time / 60, aconf->host, reason);
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-04-20 17:43:50 +00:00
|
|
|
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
2010-01-07 23:19:03 +00:00
|
|
|
"%s added temporary %d min. D-Line for [%s] [%s|%s]",
|
|
|
|
get_oper_name(source_p), tdline_time / 60,
|
|
|
|
aconf->host, reason, oper_reason);
|
2007-01-25 06:40:21 +00:00
|
|
|
ilog(L_KLINE, "D %s %d %s %s|%s",
|
2010-01-07 23:19:03 +00:00
|
|
|
get_oper_name(source_p), tdline_time / 60,
|
|
|
|
aconf->host, reason, oper_reason);
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sendto_one(source_p, ":%s NOTICE %s :Added temporary %d min. D-Line for [%s]",
|
|
|
|
me.name, source_p->name, tdline_time / 60, aconf->host);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-06-26 06:18:58 +00:00
|
|
|
add_conf_by_address(aconf->host, CONF_DLINE, NULL, NULL, aconf);
|
2010-01-07 23:19:03 +00:00
|
|
|
|
|
|
|
bandb_add(BANDB_DLINE, source_p, aconf->host, NULL,
|
|
|
|
reason, EmptyString(aconf->spasswd) ? NULL : aconf->spasswd, 0);
|
2010-01-07 23:37:52 +00:00
|
|
|
|
|
|
|
if(EmptyString(oper_reason))
|
|
|
|
{
|
|
|
|
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
|
|
|
"%s added D-Line for [%s] [%s]",
|
|
|
|
get_oper_name(source_p), aconf->host, reason);
|
|
|
|
ilog(L_KLINE, "D %s 0 %s %s",
|
|
|
|
get_oper_name(source_p), aconf->host, reason);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
|
|
|
"%s added D-Line for [%s] [%s|%s]",
|
|
|
|
get_oper_name(source_p), aconf->host, reason, oper_reason);
|
|
|
|
ilog(L_KLINE, "D %s 0 %s %s|%s",
|
|
|
|
get_oper_name(source_p),
|
|
|
|
aconf->host, reason, oper_reason);
|
|
|
|
}
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-09 07:37:03 +00:00
|
|
|
static void
|
2008-04-20 07:26:37 +00:00
|
|
|
apply_undline(struct Client *source_p, const char *cidr)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2010-01-07 23:19:03 +00:00
|
|
|
char buf[BUFSIZE];
|
2008-04-20 07:26:37 +00:00
|
|
|
struct ConfItem *aconf;
|
2007-01-25 06:40:21 +00:00
|
|
|
|
2020-07-26 17:17:18 +00:00
|
|
|
int masktype = parse_netmask(cidr, NULL, NULL);
|
2020-07-05 23:45:49 +00:00
|
|
|
|
|
|
|
if(masktype != HM_IPV4 && masktype != HM_IPV6)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2020-07-26 17:17:01 +00:00
|
|
|
sendto_one_notice(source_p, ":Invalid D-Line [%s] - doesn't look like IP[/cidr]", cidr);
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
|
2007-11-30 00:14:12 +00:00
|
|
|
aconf = find_exact_conf_by_address(cidr, CONF_DLINE, NULL);
|
|
|
|
if(aconf == NULL)
|
|
|
|
{
|
|
|
|
sendto_one_notice(source_p, ":No D-Line for %s", cidr);
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2007-11-30 00:14:12 +00:00
|
|
|
}
|
|
|
|
|
2008-04-20 04:40:40 +00:00
|
|
|
rb_strlcpy(buf, aconf->host, sizeof buf);
|
2007-11-30 00:14:12 +00:00
|
|
|
if(remove_temp_dline(aconf))
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
|
|
|
sendto_one(source_p,
|
|
|
|
":%s NOTICE %s :Un-dlined [%s] from temporary D-lines",
|
2008-04-20 07:26:37 +00:00
|
|
|
me.name, source_p->name, buf);
|
2007-01-25 06:40:21 +00:00
|
|
|
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
2010-01-07 23:19:03 +00:00
|
|
|
"%s has removed the temporary D-Line for: [%s]",
|
|
|
|
get_oper_name(source_p), buf);
|
2007-11-30 00:14:12 +00:00
|
|
|
ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), buf);
|
2016-03-09 07:37:03 +00:00
|
|
|
return;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
|
2010-01-07 23:19:03 +00:00
|
|
|
bandb_del(BANDB_DLINE, aconf->host, NULL);
|
2007-01-25 06:40:21 +00:00
|
|
|
|
2010-01-07 23:19:03 +00:00
|
|
|
sendto_one(source_p, ":%s NOTICE %s :D-Line for [%s] is removed", me.name, source_p->name,
|
|
|
|
aconf->host);
|
|
|
|
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s has removed the D-Line for: [%s]",
|
|
|
|
get_oper_name(source_p), aconf->host);
|
2008-04-20 14:05:17 +00:00
|
|
|
ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), aconf->host);
|
|
|
|
delete_one_address_conf(aconf->host, aconf);
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* remove_temp_dline()
|
|
|
|
*
|
2007-11-30 00:14:12 +00:00
|
|
|
* inputs - confitem to undline
|
2016-03-09 07:37:03 +00:00
|
|
|
* outputs - true if removed, false otherwise.
|
2007-01-25 06:40:21 +00:00
|
|
|
* side effects - tries to undline anything that matches
|
|
|
|
*/
|
2016-03-09 07:37:03 +00:00
|
|
|
static bool
|
2007-11-30 00:14:12 +00:00
|
|
|
remove_temp_dline(struct ConfItem *aconf)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2008-04-01 20:18:48 +00:00
|
|
|
rb_dlink_node *ptr;
|
2007-01-25 06:40:21 +00:00
|
|
|
int i;
|
|
|
|
|
2010-01-07 23:19:03 +00:00
|
|
|
for(i = 0; i < LAST_TEMP_TYPE; i++)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2008-04-01 20:18:48 +00:00
|
|
|
RB_DLINK_FOREACH(ptr, temp_dlines[i].head)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2010-01-07 23:19:03 +00:00
|
|
|
if(aconf == ptr->data)
|
2007-01-25 06:40:21 +00:00
|
|
|
{
|
2008-04-01 20:54:08 +00:00
|
|
|
rb_dlinkDestroy(ptr, &temp_dlines[i]);
|
2007-01-25 06:40:21 +00:00
|
|
|
delete_one_address_conf(aconf->host, aconf);
|
2016-03-09 07:37:03 +00:00
|
|
|
return true;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-09 07:37:03 +00:00
|
|
|
return false;
|
2007-01-25 06:40:21 +00:00
|
|
|
}
|