From f2edb2be59be9e73505fec2b30c7e48ef54fd3d2 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Sun, 11 Dec 2011 16:56:37 +0100 Subject: [PATCH] Disallow '$' in forward targets only, rather than all channel names. --- src/chmode.c | 5 +++++ src/match.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chmode.c b/src/chmode.c index 48d63349..822b0fc4 100644 --- a/src/chmode.c +++ b/src/chmode.c @@ -882,6 +882,11 @@ chm_ban(struct Client *source_p, struct Channel *chptr, return; if(!check_forward(source_p, chptr, forward)) return; + /* For simplicity and future flexibility, do not + * allow '$' in forwarding targets. + */ + if(strchr(forward, '$') != NULL) + return; /* Forwards only make sense for bans. */ if(mode_type != CHFL_BAN) return; diff --git a/src/match.c b/src/match.c index 46b5bec7..c786ced1 100644 --- a/src/match.c +++ b/src/match.c @@ -691,7 +691,7 @@ const unsigned int CharAttrs[] = { /* ! */ PRINT_C | KWILD_C | CHAN_C | NONEOS_C, /* " */ PRINT_C | CHAN_C | NONEOS_C, /* # */ PRINT_C | MWILD_C | CHANPFX_C | CHAN_C | NONEOS_C, -/* $ */ PRINT_C | NONEOS_C, +/* $ */ PRINT_C | CHAN_C | NONEOS_C, /* % */ PRINT_C | CHAN_C | NONEOS_C, /* & */ PRINT_C | CHANPFX_C | CHAN_C | NONEOS_C, /* ' */ PRINT_C | CHAN_C | NONEOS_C,