{
struct Ban *sile;
int flags;
+ int res;
+ char orig_mask[NICKLEN+USERLEN+HOSTLEN+3];
assert(mask && mask[0]);
mask++;
}
- /* Make the silence, set flags, and apply it. */
+ /* Make the silence and set additional flags. */
+ ircd_strncpy(orig_mask, mask, sizeof(orig_mask) - 1);
sile = make_ban(pretty_mask(mask));
sile->flags |= flags;
- return apply_ban(&cli_user(sptr)->silence, sile, 1) ? NULL : sile;
+
+ /* If they're a local user trying to ban too broad a mask, forbid it. */
+ if (MyUser(sptr)
+ && (sile->flags & BAN_IPMASK)
+ && sile->addrbits > 0
+ && sile->addrbits < (irc_in_addr_is_ipv4(&sile->address) ? 112 : 32)) {
+ send_reply(sptr, ERR_MASKTOOWIDE, orig_mask);
+ free_ban(sile);
+ return NULL;
+ }
+
+ /* Apply it to the silence list. */
+ res = apply_ban(&cli_user(sptr)->silence, sile, 1);
+ return res ? NULL : sile;
}
/** Apply and send silence updates for a user.
accepted[ac_count++] = sile;
}
-
if (MyUser(sptr)) {
size_t siles, maxsiles, totlength, maxlength, jj;
/* Free any silence-deleting updates. */
for (ii = 0; ii < ac_count; ++ii) {
- if (accepted[ii]->flags & BAN_DEL)
+ if ((accepted[ii]->flags & (BAN_ADD | BAN_DEL)) == BAN_DEL) {
free_ban(accepted[ii]);
+ }
}
}
/* See if the user is requesting a silence list. */
acptr = sptr;
if (parc < 2 || EmptyString(parv[1]) || (acptr = FindUser(parv[1]))) {
- if (cli_user(acptr)) {
+ if (cli_user(acptr) && ((acptr == sptr) || IsChannelService(acptr))) {
for (sile = cli_user(acptr)->silence; sile; sile = sile->next) {
send_reply(sptr, RPL_SILELIST, cli_name(acptr),
(sile->flags & BAN_EXCEPTION ? "~" : ""), sile->banstr);