When bursting a forwarding ban, be sure to include the forwarding part.

diff --git a/src/s_serv.c b/src/s_serv.c
index 296fa89ca322992d2fd8dbd75a944a7135bd0e3d..b5c1177459f996969228f0837cd683418b746095 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -480,7 +480,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
        {
                banptr = ptr->data;
 
-               tlen = strlen(banptr->banstr) + 1;
+               tlen = strlen(banptr->banstr) + (banptr->forward ? strlen(banptr->forward) + 1 : 0) + 1;
 
                /* uh oh */
                if(cur_len + tlen > BUFSIZE - 3)
@@ -499,7 +499,10 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
                        t = buf + mlen;
                }
 
-               rb_sprintf(t, "%s ", banptr->banstr);
+               if (banptr->forward)
+                       rb_sprintf(t, "%s$%s ", banptr->banstr, banptr->forward);
+               else
+                       rb_sprintf(t, "%s ", banptr->banstr);
                t += tlen;
                cur_len += tlen;
        }