char def[] = "No Reason";
const char *dlhost;
char *reason = def;
- char cidr_form_host[HOSTLEN + 1];
int tdline_time = 0;
const char *target_server = NULL;
int loc = 1;
if((tdline_time = valid_temp_time(parv[loc])) >= 0)
loc++;
+ if (loc >= parc)
+ {
+ sendto_one_notice(source_p, ":Need an IP to D-Line");
+ return;
+ }
+
dlhost = parv[loc];
- rb_strlcpy(cidr_form_host, dlhost, sizeof(cidr_form_host));
loc++;
/* would break the protocol */
if (*dlhost == ':')
{
- sendto_one_notice(source_p, ":Invalid D-Line");
+ sendto_one_notice(source_p, ":Invalid D-Line [%s] - IP cannot start with :", dlhost);
+ return;
+ }
+
+ int ty = parse_netmask_strict(dlhost, NULL, NULL);
+ if (ty != HM_IPV4 && ty != HM_IPV6)
+ {
+ sendto_one_notice(source_p, ":Invalid D-Line [%s] - doesn't look like IP[/cidr]", dlhost);
return;
}
if(!IsPerson(source_p))
return;
- if(!find_shared_conf(source_p->username, source_p->host,
- source_p->servptr->name,
- tdline_time > 0 ? SHARED_TDLINE : SHARED_PDLINE))
- return;
-
apply_dline(source_p, parv[2], tdline_time, LOCAL_COPY(parv[3]));
check_dlines();
if(!IsPerson(source_p))
return;
- if(!find_shared_conf(source_p->username, source_p->host,
- source_p->servptr->name, SHARED_UNDLINE))
- return;
-
apply_undline(source_p, parv[1]);
}
int t = AF_INET, ty, b;
const char *creason;
- ty = parse_netmask(dlhost, &daddr, &b);
- if(ty == HM_HOST)
+ ty = parse_netmask_strict(dlhost, &daddr, &b);
+ if(ty != HM_IPV4 && ty != HM_IPV6)
{
sendto_one(source_p, ":%s NOTICE %s :Invalid D-Line", me.name, source_p->name);
return;
}
-#ifdef RB_IPV6
if(ty == HM_IPV6)
t = AF_INET6;
else
-#endif
t = AF_INET;
/* This means dlines wider than /16 cannot be set remotely */
if((aconf = find_dline((struct sockaddr *) &daddr, t)) != NULL)
{
int bx;
- parse_netmask(aconf->host, NULL, &bx);
- if(b >= bx)
+ int masktype = parse_netmask_strict(aconf->host, NULL, &bx);
+
+ if (masktype != HM_ERROR && b >= bx)
{
creason = aconf->passwd ? aconf->passwd : "<No Reason>";
if(IsConfExemptKline(aconf))
aconf->status = CONF_DLINE;
aconf->created = rb_current_time();
aconf->host = rb_strdup(dlhost);
- aconf->passwd = rb_strdup(reason);
aconf->info.oper = operhash_add(get_oper_name(source_p));
if(strlen(reason) > BANREASONLEN)
aconf->spasswd = rb_strdup(oper_reason);
}
+ aconf->passwd = rb_strdup(reason);
+
if(tdline_time > 0)
{
aconf->hold = rb_current_time() + tdline_time;
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);
}
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);
if(EmptyString(oper_reason))
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
"%s added D-Line for [%s] [%s]",
get_oper_name(source_p), aconf->host, reason);
ilog(L_KLINE, "D %s 0 %s %s",
}
else
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
"%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",
char buf[BUFSIZE];
struct ConfItem *aconf;
- if(parse_netmask(cidr, NULL, NULL) == HM_HOST)
+ int masktype = parse_netmask(cidr, NULL, NULL);
+
+ if(masktype != HM_IPV4 && masktype != HM_IPV6)
{
- sendto_one_notice(source_p, ":Invalid D-Line");
+ sendto_one_notice(source_p, ":Invalid D-Line [%s] - doesn't look like IP[/cidr]", cidr);
return;
}
sendto_one(source_p,
":%s NOTICE %s :Un-dlined [%s] from temporary D-lines",
me.name, source_p->name, buf);
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
"%s has removed the temporary D-Line for: [%s]",
get_oper_name(source_p), buf);
ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), buf);
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]",
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%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);