]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - modules/core/m_join.c
Allow kick_on_split_riding to protect channels with mlocked keys.
[irc/rqf/shadowircd.git] / modules / core / m_join.c
index 2332fc370abd085e9309f666559287f290ec98c6..61fdf1838caa3e4b36992c1b5ba60cb009b23787 100644 (file)
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_join.c 3494 2007-05-27 13:07:27Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "packet.h"
+#include "chmode.h"
 
 static int m_join(struct Client *, struct Client *, int, const char **);
+static int me_svsjoin(struct Client *, struct Client *, int, const char **);
 static int ms_join(struct Client *, struct Client *, int, const char **);
-
-static int h_can_create_channel;
-static int h_channel_join;
+static int ms_sjoin(struct Client *, struct Client *, int, const char **);
 
 struct Message join_msgtab = {
        "JOIN", 0, 0, 0, MFLG_SLOW,
        {mg_unreg, {m_join, 2}, {ms_join, 2}, mg_ignore, mg_ignore, {m_join, 2}}
 };
 
-mapi_clist_av1 join_clist[] = { &join_msgtab, NULL };
+struct Message svsjoin_msgtab = {
+       "SVSJOIN", 0, 0, 0, MFLG_SLOW,
+       {mg_ignore, mg_ignore, mg_ignore, mg_ignore, {me_svsjoin, 3}, mg_ignore}
+};
 
-mapi_hlist_av1 join_hlist[] = {
-       { "can_create_channel", &h_can_create_channel },
-       { "channel_join", &h_channel_join },
-       { NULL, NULL },
+struct Message sjoin_msgtab = {
+       "SJOIN", 0, 0, 0, MFLG_SLOW,
+       {mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 4}, mg_ignore, mg_ignore}
 };
 
-DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3494 $");
+mapi_clist_av1 join_clist[] = { &join_msgtab, &svsjoin_msgtab, &sjoin_msgtab, NULL };
 
-static void do_join_0(struct Client *client_p, struct Client *source_p);
-static int check_channel_name_loc(struct Client *source_p, const char *name);
+DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, NULL, NULL, "$Revision: 3494 $");
 
 static void set_final_mode(struct Mode *mode, struct Mode *oldmode);
 static void remove_our_modes(struct Channel *chptr, struct Client *source_p);
 
+static void remove_ban_list(struct Channel *chptr, struct Client *source_p,
+                           rb_dlink_list * list, char c, int mems);
+
 static char modebuf[MODEBUFLEN];
+static char omodebuf[MODEBUFLEN];
 static char parabuf[MODEBUFLEN];
-static char *mbuf;
-
-/* Check what we will forward to, without sending any notices to the user
- * -- jilles
- */
-static struct Channel *
-check_forward(struct Client *source_p, struct Channel *chptr,
-               char *key)
-{
-       int depth = 0, i;
-
-       /* User is +Q */
-       if (IsNoForward(source_p))
-               return NULL;
-
-       while (depth < 16)
-       {
-               chptr = find_channel(chptr->mode.forward);
-               /* Can only forward to existing channels */
-               if (chptr == NULL)
-                       return NULL;
-               /* Already on there, show original error message */
-               if (IsMember(source_p, chptr))
-                       return NULL;
-               /* Juped. Sending a warning notice would be unfair */
-               if (hash_find_resv(chptr->chname))
-                       return NULL;
-               /* Don't forward to +Q channel */
-               if (chptr->mode.mode & MODE_DISFORWARD)
-                       return NULL;
-               i = can_join(source_p, chptr, key);
-               if (i == 0)
-                       return chptr;
-               if (i != ERR_INVITEONLYCHAN && i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_CHANNELISFULL)
-                       return NULL;
-               depth++;
-       }
-
-       return NULL;
-}
+static const char *para[MAXMODEPARAMS];
+static char *mbuf, *ombuf;
+static int pargs;
 
 /*
  * m_join
- *      parv[0] = sender prefix
  *      parv[1] = channel
  *      parv[2] = channel password (key)
  */
 static int
 m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       static char jbuf[BUFSIZE];
-       struct Channel *chptr = NULL;
-       struct ConfItem *aconf;
-       char *name;
-       char *key = NULL;
-       int i, flags = 0;
-       char *p = NULL, *p2 = NULL;
-       char *chanlist;
-       char *mykey;
-       int successful_join_count = 0;  /* Number of channels successfully joined */
-
-       jbuf[0] = '\0';
-
-       /* rebuild the list of channels theyre supposed to be joining.
-        * this code has a side effect of losing keys, but..
-        */
-       chanlist = LOCAL_COPY(parv[1]);
-       for(name = strtoken(&p, chanlist, ","); name; name = strtoken(&p, NULL, ","))
-       {
-               /* check the length and name of channel is ok */
-               if(!check_channel_name_loc(source_p, name) || (strlen(name) > LOC_CHANNELLEN))
-               {
-                       sendto_one_numeric(source_p, ERR_BADCHANNAME,
-                                          form_str(ERR_BADCHANNAME), (unsigned char *) name);
-                       continue;
-               }
-
-               /* join 0 parts all channels */
-               if(*name == '0' && (name[1] == ',' || name[1] == '\0') && name == chanlist)
-               {
-                       (void) strcpy(jbuf, "0");
-                       continue;
-               }
-
-               /* check it begins with # or &, and local chans are disabled */
-               else if(!IsChannelName(name))
-               {
-                       sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-                                          form_str(ERR_NOSUCHCHANNEL), name);
-                       continue;
-               }
-
-               /* see if its resv'd */
-               if(!IsExemptResv(source_p) && (aconf = hash_find_resv(name)))
-               {
-                       sendto_one_numeric(source_p, ERR_BADCHANNAME,
-                                          form_str(ERR_BADCHANNAME), name);
-
-                       /* dont warn for opers */
-                       if(!IsExemptJupe(source_p) && !IsOper(source_p))
-                               sendto_realops_snomask(SNO_SPY, L_NETWIDE,
-                                                    "User %s (%s@%s) is attempting to join locally juped channel %s (%s)",
-                                                    source_p->name, source_p->username,
-                                                    source_p->orighost, name, aconf->passwd);
-                       /* dont update tracking for jupe exempt users, these
-                        * are likely to be spamtrap leaves
-                        */
-                       else if(IsExemptJupe(source_p))
-                               aconf->port--;
-
-                       continue;
-               }
-
-               if(splitmode && !IsOper(source_p) && (*name != '&') &&
-                  ConfigChannel.no_join_on_split)
-               {
-                       sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
-                                  me.name, source_p->name, name);
-                       continue;
-               }
-
-               if(*jbuf)
-                       (void) strcat(jbuf, ",");
-               (void) strlcat(jbuf, name, sizeof(jbuf));
-       }
-
-       if(parc > 2)
-       {
-               mykey = LOCAL_COPY(parv[2]);
-               key = strtoken(&p2, mykey, ",");
-       }
-
-       for(name = strtoken(&p, jbuf, ","); name;
-           key = (key) ? strtoken(&p2, NULL, ",") : NULL, name = strtoken(&p, NULL, ","))
-       {
-               hook_data_channel_activity hook_info;
-
-               /* JOIN 0 simply parts all channels the user is in */
-               if(*name == '0' && !atoi(name))
-               {
-                       if(source_p->user->channel.head == NULL)
-                               continue;
-
-                       do_join_0(&me, source_p);
-                       continue;
-               }
-
-               /* look for the channel */
-               if((chptr = find_channel(name)) != NULL)
-               {
-                       if(IsMember(source_p, chptr))
-                               continue;
-
-                       flags = 0;
-               }
-               else
-               {
-                       hook_data_client_approval moduledata;
-
-                       moduledata.client = source_p;
-                       moduledata.approved = 0;
-
-                       call_hook(h_can_create_channel, &moduledata);
-
-                       if(moduledata.approved != 0)
-                       {
-                               sendto_one(source_p, form_str(moduledata.approved),
-                                          me.name, source_p->name, name);
-                               continue;
-                       }
-
-                       if(splitmode && !IsOper(source_p) && (*name != '&') &&
-                          ConfigChannel.no_create_on_split)
-                       {
-                               sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
-                                          me.name, source_p->name, name);
-                               continue;
-                       }
-
-                       flags = CHFL_CHANOP;
-               }
-
-               if((rb_dlink_list_length(&source_p->user->channel) >=
-                   (unsigned long) ConfigChannel.max_chans_per_user) &&
-                  (!IsOper(source_p) ||
-                   (rb_dlink_list_length(&source_p->user->channel) >=
-                    (unsigned long) ConfigChannel.max_chans_per_user * 3)))
-               {
-                       sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
-                                  me.name, source_p->name, name);
-                       if(successful_join_count)
-                               source_p->localClient->last_join_time = CurrentTime;
-                       return 0;
-               }
-
-               if(flags == 0)  /* if channel doesn't exist, don't penalize */
-                       successful_join_count++;
+       user_join(client_p, source_p, parv[1], parc > 2 ? parv[2] : NULL); /* channel.c */
 
-               if(chptr == NULL)       /* If I already have a chptr, no point doing this */
-               {
-                       chptr = get_or_create_channel(source_p, name, NULL);
-
-                       if(chptr == NULL)
-                       {
-                               sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
-                                          me.name, source_p->name, name);
-                               if(successful_join_count > 0)
-                                       successful_join_count--;
-                               continue;
-                       }
-               }
-
-               if(!IsOper(source_p) && !IsExemptSpambot(source_p))
-                       check_spambot_warning(source_p, name);
-
-               /* can_join checks for +i key, bans etc */
-               if((i = can_join(source_p, chptr, key)))
-               {
-                       if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
-                           (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))
-                       {
-                               sendto_one(source_p, form_str(i), me.name, source_p->name, name);
-                               if(successful_join_count > 0)
-                                       successful_join_count--;
-                               continue;
-                       }
-                       sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
-               }
-
-               /* add the user to the channel */
-               add_user_to_channel(chptr, source_p, flags);
-               if (chptr->mode.join_num &&
-                       CurrentTime - chptr->join_delta >= chptr->mode.join_time)
-               {
-                       chptr->join_count = 0;
-                       chptr->join_delta = CurrentTime;
-               }
-               chptr->join_count++;
-
-               /* we send the user their join here, because we could have to
-                * send a mode out next.
-                */
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
-                                    source_p->name,
-                                    source_p->username, source_p->host, chptr->chname);
-
-               /* its a new channel, set +nt and burst. */
-               if(flags & CHFL_CHANOP)
-               {
-                       chptr->channelts = CurrentTime;
-                       chptr->mode.mode |= MODE_TOPICLIMIT;
-                       chptr->mode.mode |= MODE_NOPRIVMSGS;
-
-                       sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s +nt",
-                                            me.name, chptr->chname);
-
-                       if(*chptr->chname == '#')
-                       {
-                               sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
-                                             ":%s SJOIN %ld %s +nt :@%s",
-                                             me.id, (long) chptr->channelts,
-                                             chptr->chname, source_p->id);
-                               sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-                                             ":%s SJOIN %ld %s +nt :@%s",
-                                             me.name, (long) chptr->channelts,
-                                             chptr->chname, source_p->name);
-                       }
-               }
-               else
-               {
-                       sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
-                                     ":%s JOIN %ld %s +",
-                                     use_id(source_p), (long) chptr->channelts,
-                                     chptr->chname);
-
-                       sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-                                     ":%s SJOIN %ld %s + :%s",
-                                     me.name, (long) chptr->channelts,
-                                     chptr->chname, source_p->name);
-               }
-
-               del_invite(chptr, source_p);
-
-               if(chptr->topic != NULL)
-               {
-                       sendto_one(source_p, form_str(RPL_TOPIC), me.name,
-                                  source_p->name, chptr->chname, chptr->topic);
+       return 0;
+}
 
-                       sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
-                                  me.name, source_p->name, chptr->chname,
-                                  chptr->topic_info, chptr->topic_time);
-               }
+/*
+ * me_svsjoin - small function to allow services to forcejoin clients, mainly for ns_ajoin
+ *             parv[1] = user to act on (join to a channel)
+ *             parv[2] = channel
+ * This does allow opers to "forcejoin" users to channels with operserv/raw or by writing a
+ * custom module (where they can make it not log anything), but the former bitches that it's
+ * being used and the latter...Can probably be done anyway with enough hackyness if this
+ * command didn't exist so it's not all that bad.
+ */
+static int
+me_svsjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+{
+       struct Client *target_p;
 
-               channel_member_names(chptr, source_p, 1);
+       if(!(source_p->flags & FLAGS_SERVICE))
+               return 0;
 
-               if(successful_join_count)
-                       source_p->localClient->last_join_time = CurrentTime;
+       if((target_p = find_person(parv[1])) == NULL)
+               return 0;
 
-               hook_info.client = source_p;
-               hook_info.chptr = chptr;
-               hook_info.key = key;
-               call_hook(h_channel_join, &hook_info);
-       }
+       if(!MyClient(target_p))
+               return 0;
 
+       user_join(&me, target_p, parv[2], NULL);
        return 0;
 }
 
 /*
  * ms_join
- *
- * inputs      -
- * output      - none
- * side effects        - handles remote JOIN's sent by servers. In TSora
- *               remote clients are joined using SJOIN, hence a 
- *               JOIN sent by a server on behalf of a client is an error.
- *               here, the initial code is in to take an extra parameter
- *               and use it for the TimeStamp on a new channel.
+ *      parv[1] = channel TS
+ *      parv[2] = channel
+ *      parv[3] = "+", formerly channel modes but now unused
+ * alternatively, a single "0" parameter parts all channels
  */
 static int
 ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -420,6 +155,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
                return 0;
 
        mbuf = modebuf;
+       ombuf = omodebuf;
        mode.key[0] = mode.forward[0] = '\0';
        mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
 
@@ -488,135 +224,690 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
                                             ":%s MODE %s %s %s",
                                             source_p->servptr->name,
                                             chptr->chname, modebuf, parabuf);
-               *modebuf = *parabuf = '\0';
+               if(*omodebuf != '\0')
+                       sendto_channel_local(ONLY_OPERS, chptr,
+                                       ":%s MODE %s %s %s",
+                                       source_p->servptr->name,
+                                       chptr->chname, modebuf, parabuf);
+               *omodebuf = *modebuf = *parabuf = '\0';
+
+               /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+               set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
        }
 
-       if(!IsMember(source_p, chptr))
-       {
-               add_user_to_channel(chptr, source_p, CHFL_PEON);
-               if (chptr->mode.join_num &&
-                       CurrentTime - chptr->join_delta >= chptr->mode.join_time)
+       if(!IsMember(source_p, chptr))
+       {
+               add_user_to_channel(chptr, source_p, CHFL_PEON);
+               if (chptr->mode.join_num &&
+                       rb_current_time() - chptr->join_delta >= chptr->mode.join_time)
+               {
+                       chptr->join_count = 0;
+                       chptr->join_delta = rb_current_time();
+               }
+               chptr->join_count++;
+               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
+                                    source_p->name, source_p->username,
+                                    source_p->host, chptr->chname);
+       }
+
+       sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+                     ":%s JOIN %ld %s +",
+                     source_p->id, (long) chptr->channelts, chptr->chname);
+       return 0;
+}
+
+static int
+ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+{
+       static char buf_uid[BUFSIZE];
+       static const char empty_modes[] = "0";
+       struct Channel *chptr;
+       struct Client *target_p, *fakesource_p;
+       time_t newts;
+       time_t oldts;
+       static struct Mode mode, *oldmode;
+       const char *modes;
+       int args = 0;
+       int keep_our_modes = 1;
+       int keep_new_modes = 1;
+       int fl;
+       int isnew;
+       int mlen_uid;
+       int len_nick;
+       int len_uid;
+       int len;
+       int joins = 0;
+       const char *s;
+       char *ptr_uid;
+       char *p;
+       int i, joinc = 0, timeslice = 0;
+       static char empty[] = "";
+       rb_dlink_node *ptr, *next_ptr;
+
+       if(!IsChannelName(parv[2]) || !check_channel_name(parv[2]))
+               return 0;
+
+       /* SJOIN's for local channels can't happen. */
+       if(*parv[2] == '&')
+               return 0;
+
+       omodebuf[0] = modebuf[0] = parabuf[0] = mode.key[0] = mode.forward[0] = '\0';
+       pargs = mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
+
+       /* Hide connecting server on netburst -- jilles */
+       if (ConfigServerHide.flatten_links && !HasSentEob(source_p))
+               fakesource_p = &me;
+       else
+               fakesource_p = source_p;
+
+       mbuf = modebuf;
+       ombuf = omodebuf;
+       newts = atol(parv[1]);
+
+       s = parv[3];
+       while (*s)
+       {
+               switch (*(s++))
+               {
+               case 'f':
+                       rb_strlcpy(mode.forward, parv[4 + args], sizeof(mode.forward));
+                       args++;
+                       if(parc < 5 + args)
+                               return 0;
+                       break;
+               case 'j':
+                       sscanf(parv[4 + args], "%d:%d", &joinc, &timeslice);
+                       args++;
+                       mode.join_num = joinc;
+                       mode.join_time = timeslice;
+                       if(parc < 5 + args)
+                               return 0;
+                       break;
+               case 'k':
+                       rb_strlcpy(mode.key, parv[4 + args], sizeof(mode.key));
+                       args++;
+                       if(parc < 5 + args)
+                               return 0;
+                       break;
+               case 'l':
+                       mode.limit = atoi(parv[4 + args]);
+                       args++;
+                       if(parc < 5 + args)
+                               return 0;
+                       break;
+               default:
+                       if(chmode_flags[(int) *s] != 0)
+                       {
+                               mode.mode |= chmode_flags[(int) *s];
+                       }
+               }
+       }
+
+       if(parv[args + 4])
+       {
+               s = parv[args + 4];
+
+               /* remove any leading spaces */
+               while (*s == ' ')
+                       s++;
+       }
+       else
+               s = "";
+
+       if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
+               return 0;       /* channel name too long? */
+
+
+       oldts = chptr->channelts;
+       oldmode = &chptr->mode;
+
+#ifdef IGNORE_BOGUS_TS
+       if(newts < 800000000)
+       {
+               sendto_realops_snomask(SNO_DEBUG, L_ALL,
+                                    "*** Bogus TS %ld on %s ignored from %s",
+                                    (long) newts, chptr->chname, client_p->name);
+
+               newts = (oldts == 0) ? oldts : 800000000;
+       }
+#else
+       if(!isnew && !newts && oldts)
+       {
+               sendto_channel_local(ALL_MEMBERS, chptr,
+                                    ":%s NOTICE %s :*** Notice -- TS for %s "
+                                    "changed from %ld to 0",
+                                    me.name, chptr->chname, chptr->chname, (long) oldts);
+               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                                    "Server %s changing TS on %s from %ld to 0",
+                                    source_p->name, chptr->chname, (long) oldts);
+       }
+#endif
+
+       if(isnew)
+               chptr->channelts = newts;
+       
+       else if(newts == 0 || oldts == 0)
+               chptr->channelts = 0;
+       else if(newts == oldts)
+               ;
+       else if(newts < oldts)
+       {
+               /* If configured, kick people trying to join +i/+k
+                * channels by recreating them on split servers.
+                * If the source has sent EOB, assume this is some
+                * sort of hack by services. If cmode +i is set,
+                * services can send kicks if needed; if the key
+                * differs, services cannot kick in a race-free
+                * manner so do so here.
+                * -- jilles */
+               if (ConfigChannel.kick_on_split_riding &&
+                               ((!HasSentEob(source_p) &&
+                               mode.mode & MODE_INVITEONLY) ||
+                   (mode.key[0] != 0 && irccmp(mode.key, oldmode->key) != 0)))
+               {
+                       struct membership *msptr;
+                       struct Client *who;
+                       int l = rb_dlink_list_length(&chptr->members);
+
+                       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
+                       {
+                               msptr = ptr->data;
+                               who = msptr->client_p;
+                               sendto_one(who, ":%s KICK %s %s :Net Rider",
+                                                    me.name, chptr->chname, who->name);
+
+                               sendto_server(NULL, chptr, CAP_TS6, NOCAPS,
+                                             ":%s KICK %s %s :Net Rider",
+                                             me.id, chptr->chname,
+                                             who->id);
+                               remove_user_from_channel(msptr);
+                               if (--l == 0)
+                                       break;
+                       }
+                       if (l == 0)
+                       {
+                               /* Channel was emptied, create a new one */
+                               if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
+                                       return 0;               /* oops! */
+
+                               oldmode = &chptr->mode;
+                       }
+               }
+               keep_our_modes = NO;
+               chptr->channelts = newts;
+       }
+       else
+               keep_new_modes = NO;
+
+       if(!keep_new_modes)
+               mode = *oldmode;
+       else if(keep_our_modes)
+       {
+               mode.mode |= oldmode->mode;
+               if(oldmode->limit > mode.limit)
+                       mode.limit = oldmode->limit;
+               if(strcmp(mode.key, oldmode->key) < 0)
+                       strcpy(mode.key, oldmode->key);
+               if(oldmode->join_num > mode.join_num ||
+                               (oldmode->join_num == mode.join_num &&
+                                oldmode->join_time > mode.join_time))
+               {
+                       mode.join_num = oldmode->join_num;
+                       mode.join_time = oldmode->join_time;
+               }
+               if(irccmp(mode.forward, oldmode->forward) < 0)
+                       strcpy(mode.forward, oldmode->forward);
+       }
+       else
+       {
+               /* If setting -j, clear join throttle state -- jilles */
+               if (!mode.join_num)
+                       chptr->join_count = chptr->join_delta = 0;
+       }
+
+       set_final_mode(&mode, oldmode);
+       chptr->mode = mode;
+
+       /* Lost the TS, other side wins, so remove modes on this side */
+       if(!keep_our_modes)
+       {
+               remove_our_modes(chptr, fakesource_p);
+               RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
+               {
+                       del_invite(chptr, ptr->data);
+               }
+
+               if(rb_dlink_list_length(&chptr->banlist) > 0)
+                       remove_ban_list(chptr, fakesource_p, &chptr->banlist, 'b', ALL_MEMBERS);
+               if(rb_dlink_list_length(&chptr->exceptlist) > 0)
+                       remove_ban_list(chptr, fakesource_p, &chptr->exceptlist,
+                                       'e', ONLY_CHANOPS);
+               if(rb_dlink_list_length(&chptr->invexlist) > 0)
+                       remove_ban_list(chptr, fakesource_p, &chptr->invexlist,
+                                       'I', ONLY_CHANOPS);
+               if(rb_dlink_list_length(&chptr->quietlist) > 0)
+                       remove_ban_list(chptr, fakesource_p, &chptr->quietlist,
+                                       'q', ALL_MEMBERS);
+               chptr->bants++;
+
+               sendto_channel_local(ALL_MEMBERS, chptr,
+                                    ":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld",
+                                    me.name, chptr->chname, chptr->chname,
+                                    (long) oldts, (long) newts);
+               /* Update capitalization in channel name, this makes the
+                * capitalization timestamped like modes are -- jilles */
+               strcpy(chptr->chname, parv[2]);
+
+               /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+               set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
+       }
+
+       if(*modebuf != '\0')
+               sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s %s %s",
+                                    fakesource_p->name, chptr->chname, modebuf, parabuf);
+
+       if(*omodebuf != '\0')
+               sendto_channel_local(ONLY_OPERS, chptr, ":%s MODE %s %s %s",
+                               fakesource_p->name, chptr->chname, omodebuf, parabuf);
+
+       *omodebuf = *modebuf = *parabuf = '\0';
+
+       if(parv[3][0] != '0' && keep_new_modes)
+               modes = channel_modes(chptr, source_p);
+       else
+               modes = empty_modes;
+
+       mlen_uid = rb_sprintf(buf_uid, ":%s SJOIN %ld %s %s :",
+                             use_id(source_p), (long) chptr->channelts, parv[2], modes);
+       ptr_uid = buf_uid + mlen_uid;
+
+       mbuf = modebuf;
+       ombuf = omodebuf;
+       para[0] = para[1] = para[2] = para[3] = empty;
+       pargs = 0;
+       len_nick = len_uid = 0;
+
+       /* if theres a space, theres going to be more than one nick, change the
+        * first space to \0, so s is just the first nick, and point p to the
+        * second nick
+        */
+       if((p = strchr(s, ' ')) != NULL)
+       {
+               *p++ = '\0';
+       }
+
+       *mbuf++ = '+';
+
+       while (s)
+       {
+               fl = 0;
+
+               for (i = 0; i < 4; i++)
+               {
+                       if(*s == '!')
+                       {
+                               fl |= CHFL_ADMIN;
+                               s++;
+                       }
+                       else if(*s == '@')
+                       {
+                               fl |= CHFL_CHANOP;
+                               s++;
+                       }
+                       else if(*s == '%')
+                       {
+                               fl |= CHFL_HALFOP;
+                               s++;
+                       }
+                       else if(*s == '+')
+                       {
+                               fl |= CHFL_VOICE;
+                               s++;
+                       }
+               }
+
+               /* if the client doesnt exist or is fake direction, skip. */
+               if(!(target_p = find_client(s)) ||
+                  (target_p->from != client_p) || !IsPerson(target_p))
+                       goto nextnick;
+
+               /* we assume for these we can fit at least one nick/uid in.. */
+
+               /* check we can fit another status+nick+space into a buffer */
+               if((mlen_uid + len_uid + IDLEN + 3) > (BUFSIZE - 3))
+               {
+                       *(ptr_uid - 1) = '\0';
+                       sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
+                       ptr_uid = buf_uid + mlen_uid;
+                       len_uid = 0;
+               }
+
+               if(keep_new_modes)
+               {
+                       if(fl & CHFL_ADMIN)
+                       {
+                               *ptr_uid++ = '!';
+                               len_nick++;
+                               len_uid++;
+                       }
+                       if(fl & CHFL_CHANOP)
+                       {
+                               *ptr_uid++ = '@';
+                               len_nick++;
+                               len_uid++;
+                       }
+                       if(fl & CHFL_HALFOP)
+                       {
+                               *ptr_uid++ = '%';
+                               len_nick++;
+                               len_uid++;
+                       }
+                       if(fl & CHFL_VOICE)
+                       {
+                               *ptr_uid++ = '+';
+                               len_nick++;
+                               len_uid++;
+                       }
+               }
+
+               /* copy the nick to the two buffers */
+               len = rb_sprintf(ptr_uid, "%s ", use_id(target_p));
+               ptr_uid += len;
+               len_uid += len;
+
+               if(!keep_new_modes)
+                       fl = 0;
+
+               if(!IsMember(target_p, chptr))
+               {
+                       add_user_to_channel(chptr, target_p, fl);
+                       sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
+                                            target_p->name,
+                                            target_p->username, target_p->host, parv[2]);
+                       joins++;
+               }
+
+               /* If anyone can think of a way to do this that doesn't make babies cry
+                * I would love to hear it - Taros */
+
+               if(fl & CHFL_ADMIN)
+               {
+                       *mbuf++ = 'a';
+                       para[pargs++] = target_p->name;
+
+                       if(fl & CHFL_CHANOP)
+                       {
+                               /* its possible the +a has filled up MAXMODEPARAMS, if so, start
+                                * a new buffer
+                                */
+                               if(pargs >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            fakesource_p->name, chptr->chname,
+                                                            modebuf,
+                                                            para[0], para[1], para[2], para[3]);
+                                       mbuf = modebuf;
+                                       *mbuf++ = '+';
+                                       para[0] = para[1] = para[2] = para[3] = NULL;
+                                       pargs = 0;
+                               }
+
+                               *mbuf++ = 'o';
+                               para[pargs++] = target_p->name;
+                       }
+                       if(fl & CHFL_HALFOP)
+                       {
+                               /* its possible the +a has filled up MAXMODEPARAMS, if so, start
+                                * a new buffer
+                                */
+                               if(pargs >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            fakesource_p->name, chptr->chname,
+                                                            modebuf,
+                                                            para[0], para[1], para[2], para[3]);
+                                       mbuf = modebuf;
+                                       *mbuf++ = '+';
+                                       para[0] = para[1] = para[2] = para[3] = NULL;
+                                       pargs = 0;
+                               }
+
+                               *mbuf++ = 'h';
+                               para[pargs++] = target_p->name;
+                       }
+                       if(fl & CHFL_VOICE)
+                       {
+                               /* its possible the +a has filled up MAXMODEPARAMS, if so, start
+                                * a new buffer
+                                */
+                               if(pargs >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            fakesource_p->name, chptr->chname,
+                                                            modebuf,
+                                                            para[0], para[1], para[2], para[3]);
+                                       mbuf = modebuf;
+                                       *mbuf++ = '+';
+                                       para[0] = para[1] = para[2] = para[3] = NULL;
+                                       pargs = 0;
+                               }
+
+                               *mbuf++ = 'v';
+                               para[pargs++] = target_p->name;
+                       }
+               }
+               else if(fl & CHFL_CHANOP)
                {
-                       chptr->join_count = 0;
-                       chptr->join_delta = CurrentTime;
+                       *mbuf++ = 'o';
+                       para[pargs++] = target_p->name;
+
+                       if(fl & CHFL_HALFOP)
+                       {
+                               /* its possible the +o has filled up MAXMODEPARAMS, if so, start
+                                * a new buffer
+                                */
+                               if(pargs >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            fakesource_p->name, chptr->chname,
+                                                            modebuf,
+                                                            para[0], para[1], para[2], para[3]);
+                                       mbuf = modebuf;
+                                       *mbuf++ = '+';
+                                       para[0] = para[1] = para[2] = para[3] = NULL;
+                                       pargs = 0;
+                               }
+
+                               *mbuf++ = 'h';
+                               para[pargs++] = target_p->name;
+                       }
+                       if(fl & CHFL_VOICE)
+                       {
+                               /* its possible the +o has filled up MAXMODEPARAMS, if so, start
+                                * a new buffer
+                                */
+                               if(pargs >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            fakesource_p->name, chptr->chname,
+                                                            modebuf,
+                                                            para[0], para[1], para[2], para[3]);
+                                       mbuf = modebuf;
+                                       *mbuf++ = '+';
+                                       para[0] = para[1] = para[2] = para[3] = NULL;
+                                       pargs = 0;
+                               }
+
+                               *mbuf++ = 'v';
+                               para[pargs++] = target_p->name;
+                       }
                }
-               chptr->join_count++;
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
-                                    source_p->name, source_p->username,
-                                    source_p->host, chptr->chname);
-       }
+               else if(fl & CHFL_HALFOP)
+               {
+                       *mbuf++ = 'h';
+                       para[pargs++] = target_p->name;
 
-       sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
-                     ":%s JOIN %ld %s +",
-                     source_p->id, (long) chptr->channelts, chptr->chname);
-       sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-                     ":%s SJOIN %ld %s %s :%s",
-                     source_p->servptr->name, (long) chptr->channelts,
-                     chptr->chname, keep_new_modes ? "+" : "0",
-                     source_p->name);
-       return 0;
-}
+                       if(fl & CHFL_VOICE)
+                       {
+                               /* its possible the +h has filled up MAXMODEPARAMS, if so, start
+                                * a new buffer
+                                */
+                               if(pargs >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            fakesource_p->name, chptr->chname,
+                                                            modebuf,
+                                                            para[0], para[1], para[2], para[3]);
+                                       mbuf = modebuf;
+                                       *mbuf++ = '+';
+                                       para[0] = para[1] = para[2] = para[3] = NULL;
+                                       pargs = 0;
+                               }
 
-/*
- * do_join_0
- *
- * inputs      - pointer to client doing join 0
- * output      - NONE
- * side effects        - Use has decided to join 0. This is legacy
- *               from the days when channels were numbers not names. *sigh*
- *               There is a bunch of evilness necessary here due to
- *               anti spambot code.
- */
-static void
-do_join_0(struct Client *client_p, struct Client *source_p)
-{
-       struct membership *msptr;
-       struct Channel *chptr = NULL;
-       rb_dlink_node *ptr;
+                               *mbuf++ = 'v';
+                               para[pargs++] = target_p->name;
+                       }
+               }
+               else if(fl & CHFL_VOICE)
+               {
+                       *mbuf++ = 'v';
+                       para[pargs++] = target_p->name;
+               }
 
-       /* Finish the flood grace period... */
-       if(MyClient(source_p) && !IsFloodDone(source_p))
-               flood_endgrace(source_p);
+               if(pargs >= MAXMODEPARAMS)
+               {
+                       *mbuf = '\0';
+                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                            ":%s MODE %s %s %s %s %s %s",
+                                            fakesource_p->name,
+                                            chptr->chname,
+                                            modebuf, para[0], para[1], para[2], para[3]);
+                       mbuf = modebuf;
+                       *mbuf++ = '+';
+                       para[0] = para[1] = para[2] = para[3] = NULL;
+                       pargs = 0;
+               }
 
+             nextnick:
+               /* p points to the next nick */
+               s = p;
 
-       sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
-       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s JOIN 0", source_p->name);
+               /* if there was a trailing space and p was pointing to it, then we
+                * need to exit.. this has the side effect of breaking double spaces
+                * in an sjoin.. but that shouldnt happen anyway
+                */
+               if(s && (*s == '\0'))
+                       s = p = NULL;
 
-       if(source_p->user->channel.head && MyConnect(source_p) &&
-          !IsOper(source_p) && !IsExemptSpambot(source_p))
-               check_spambot_warning(source_p, NULL);
+               /* if p was NULL due to no spaces, s wont exist due to the above, so
+                * we cant check it for spaces.. if there are no spaces, then when
+                * we next get here, s will be NULL
+                */
+               if(s && ((p = strchr(s, ' ')) != NULL))
+               {
+                       *p++ = '\0';
+               }
+       }
 
-       while((ptr = source_p->user->channel.head))
+       *mbuf = '\0';
+       if(pargs)
        {
-               msptr = ptr->data;
-               chptr = msptr->chptr;
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
-                                    source_p->name,
-                                    source_p->username, source_p->host, chptr->chname);
-               remove_user_from_channel(msptr);
+               sendto_channel_local(ALL_MEMBERS, chptr,
+                                    ":%s MODE %s %s %s %s %s %s",
+                                    fakesource_p->name, chptr->chname, modebuf,
+                                    para[0], CheckEmpty(para[1]),
+                                    CheckEmpty(para[2]), CheckEmpty(para[3]));
        }
-}
-
-static int
-check_channel_name_loc(struct Client *source_p, const char *name)
-{
-       s_assert(name != NULL);
-       if(EmptyString(name))
-               return 0;
 
-       if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
+       if(!joins && !(chptr->mode.mode & MODE_PERMANENT) && isnew)
        {
-               for(; *name; ++name)
-               {
-                       if(!IsChanChar(*name) || IsFakeChanChar(*name))
-                               return 0;
-               }
+               destroy_channel(chptr);
+
+               return 0;
        }
-       else
+
+       /* Keep the colon if we're sending an SJOIN without nicks -- jilles */
+       if (joins)
        {
-               for(; *name; ++name)
-               {
-                       if(!IsChanChar(*name))
-                               return 0;
-               }
+               *(ptr_uid - 1) = '\0';
        }
 
-       return 1;
+       sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
+
+       return 0;
 }
 
+
 static void
 set_final_mode(struct Mode *mode, struct Mode *oldmode)
 {
-       int dir = MODE_QUERY;
+       int dir = MODE_QUERY, odir = MODE_QUERY;
        char *pbuf = parabuf;
        int len;
        int i;
 
        /* ok, first get a list of modes we need to add */
-       for(i = 0; chmode_flags[i].letter; i++)
+       for (i = 0; i < 256; i++)
        {
-               if((mode->mode & chmode_flags[i].mode) && !(oldmode->mode & chmode_flags[i].mode))
+               if((mode->mode & chmode_flags[i]) && !(oldmode->mode & chmode_flags[i]))
                {
-                       if(dir != MODE_ADD)
+                       if (chmode_table[i].set_func == chm_hidden)
+                       {
+                               if(odir != MODE_ADD)
+                               {
+                                       *ombuf++ = '+';
+                                       odir = MODE_ADD;
+                               }
+                               *ombuf++ = i;
+                       }
+                       else
                        {
-                               *mbuf++ = '+';
-                               dir = MODE_ADD;
+                               if(dir != MODE_ADD)
+                               {
+                                       *mbuf++ = '+';
+                                       dir = MODE_ADD;
+                               }
+                               *mbuf++ = i;
+
                        }
-                       *mbuf++ = chmode_flags[i].letter;
                }
        }
 
        /* now the ones we need to remove. */
-       for(i = 0; chmode_flags[i].letter; i++)
+       for (i = 0; i < 256; i++)
        {
-               if((oldmode->mode & chmode_flags[i].mode) && !(mode->mode & chmode_flags[i].mode))
+               if((oldmode->mode & chmode_flags[i]) && !(mode->mode & chmode_flags[i]))
                {
-                       if(dir != MODE_DEL)
+                       if(chmode_table[i].set_func == chm_hidden)
+                       {
+                               if(odir != MODE_DEL)
+                               {
+                                       *ombuf++ = '-';
+                                       odir = MODE_DEL;
+                               }
+                               *ombuf++ = i;
+                       }
+                       else
                        {
-                               *mbuf++ = '-';
-                               dir = MODE_DEL;
+                               if(dir != MODE_DEL)
+                               {
+                                       *mbuf++ = '-';
+                                       dir = MODE_DEL;
+                               }
+                               *mbuf++ = i;
                        }
-                       *mbuf++ = chmode_flags[i].letter;
                }
        }
 
@@ -732,13 +1023,152 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
        {
                msptr = ptr->data;
 
-               if(is_chanop(msptr))
+               /* If anyone can think of a way to do this that doesn't make babies cry
+                * I would love to hear it - Taros */
+
+               if(is_admin(msptr))
+               {
+                       msptr->flags &= ~CHFL_ADMIN;
+                       lpara[count++] = msptr->client_p->name;
+                       *mbuf++ = 'a';
+
+                       /* Make sure it fits if +h, +o, or +v are involved */
+                       if(is_chanop(msptr))
+                       {
+                               if(count >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            source_p->name, chptr->chname,
+                                                            lmodebuf, lpara[0], lpara[1],
+                                                            lpara[2], lpara[3]);
+
+                                       /* preserve the initial '-' */
+                                       mbuf = lmodebuf;
+                                       *mbuf++ = '-';
+                                       count = 0;
+
+                                       for(i = 0; i < MAXMODEPARAMS; i++)
+                                               lpara[i] = NULL;
+                               }
+
+                               msptr->flags &= ~CHFL_CHANOP;
+                               lpara[count++] = msptr->client_p->name;
+                               *mbuf++ = 'o';
+                       }
+                       if(is_halfop(msptr))
+                       {
+                               if(count >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            source_p->name, chptr->chname,
+                                                            lmodebuf, lpara[0], lpara[1],
+                                                            lpara[2], lpara[3]);
+
+                                       /* preserve the initial '-' */
+                                       mbuf = lmodebuf;
+                                       *mbuf++ = '-';
+                                       count = 0;
+
+                                       for(i = 0; i < MAXMODEPARAMS; i++)
+                                               lpara[i] = NULL;
+                               }
+
+                               msptr->flags &= ~CHFL_HALFOP;
+                               lpara[count++] = msptr->client_p->name;
+                               *mbuf++ = 'h';
+                       }
+                       if(is_voiced(msptr))
+                       {
+                               if(count >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            source_p->name, chptr->chname,
+                                                            lmodebuf, lpara[0], lpara[1],
+                                                            lpara[2], lpara[3]);
+
+                                       /* preserve the initial '-' */
+                                       mbuf = lmodebuf;
+                                       *mbuf++ = '-';
+                                       count = 0;
+
+                                       for(i = 0; i < MAXMODEPARAMS; i++)
+                                               lpara[i] = NULL;
+                               }
+
+                               msptr->flags &= ~CHFL_VOICE;
+                               lpara[count++] = msptr->client_p->name;
+                               *mbuf++ = 'v';
+                       }
+               }
+               else if(is_chanop(msptr))
                {
                        msptr->flags &= ~CHFL_CHANOP;
                        lpara[count++] = msptr->client_p->name;
                        *mbuf++ = 'o';
 
-                       /* +ov, might not fit so check. */
+                       /* Make sure it fits if +h or +v are involved */
+                       if(is_halfop(msptr))
+                       {
+                               if(count >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            source_p->name, chptr->chname,
+                                                            lmodebuf, lpara[0], lpara[1],
+                                                            lpara[2], lpara[3]);
+
+                                       /* preserve the initial '-' */
+                                       mbuf = lmodebuf;
+                                       *mbuf++ = '-';
+                                       count = 0;
+
+                                       for(i = 0; i < MAXMODEPARAMS; i++)
+                                               lpara[i] = NULL;
+                               }
+
+                               msptr->flags &= ~CHFL_HALFOP;
+                               lpara[count++] = msptr->client_p->name;
+                               *mbuf++ = 'h';
+                       }
+                       if(is_voiced(msptr))
+                       {
+                               if(count >= MAXMODEPARAMS)
+                               {
+                                       *mbuf = '\0';
+                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                                            ":%s MODE %s %s %s %s %s %s",
+                                                            source_p->name, chptr->chname,
+                                                            lmodebuf, lpara[0], lpara[1],
+                                                            lpara[2], lpara[3]);
+
+                                       /* preserve the initial '-' */
+                                       mbuf = lmodebuf;
+                                       *mbuf++ = '-';
+                                       count = 0;
+
+                                       for(i = 0; i < MAXMODEPARAMS; i++)
+                                               lpara[i] = NULL;
+                               }
+
+                               msptr->flags &= ~CHFL_VOICE;
+                               lpara[count++] = msptr->client_p->name;
+                               *mbuf++ = 'v';
+                       }
+               }
+               else if(is_halfop(msptr))
+               {
+                       msptr->flags &= ~CHFL_HALFOP;
+                       lpara[count++] = msptr->client_p->name;
+                       *mbuf++ = 'h';
+
+                       /* +hv, might not fit so check. */
                        if(is_voiced(msptr))
                        {
                                if(count >= MAXMODEPARAMS)
@@ -746,7 +1176,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
                                        *mbuf = '\0';
                                        sendto_channel_local(ALL_MEMBERS, chptr,
                                                             ":%s MODE %s %s %s %s %s %s",
-                                                            me.name, chptr->chname,
+                                                            source_p->name, chptr->chname,
                                                             lmodebuf, lpara[0], lpara[1],
                                                             lpara[2], lpara[3]);
 
@@ -778,7 +1208,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
                        *mbuf = '\0';
                        sendto_channel_local(ALL_MEMBERS, chptr,
                                             ":%s MODE %s %s %s %s %s %s",
-                                            me.name, chptr->chname, lmodebuf,
+                                            source_p->name, chptr->chname, lmodebuf,
                                             lpara[0], lpara[1], lpara[2], lpara[3]);
                        mbuf = lmodebuf;
                        *mbuf++ = '-';
@@ -794,7 +1224,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
                *mbuf = '\0';
                sendto_channel_local(ALL_MEMBERS, chptr,
                                     ":%s MODE %s %s %s %s %s %s",
-                                    me.name, chptr->chname, lmodebuf,
+                                    source_p->name, chptr->chname, lmodebuf,
                                     EmptyString(lpara[0]) ? "" : lpara[0],
                                     EmptyString(lpara[1]) ? "" : lpara[1],
                                     EmptyString(lpara[2]) ? "" : lpara[2],
@@ -802,3 +1232,64 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
 
        }
 }
+
+/* remove_ban_list()
+ *
+ * inputs      - channel, source, list to remove, char of mode, caps needed
+ * outputs     -
+ * side effects - given list is removed, with modes issued to local clients
+ */
+static void
+remove_ban_list(struct Channel *chptr, struct Client *source_p,
+               rb_dlink_list * list, char c, int mems)
+{
+       static char lmodebuf[BUFSIZE];
+       static char lparabuf[BUFSIZE];
+       struct Ban *banptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
+       char *pbuf;
+       int count = 0;
+       int cur_len, mlen, plen;
+
+       pbuf = lparabuf;
+
+       cur_len = mlen = rb_sprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname);
+       mbuf = lmodebuf + mlen;
+
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
+       {
+               banptr = ptr->data;
+
+               /* trailing space, and the mode letter itself */
+               plen = strlen(banptr->banstr) + 2;
+
+               if(count >= MAXMODEPARAMS || (cur_len + plen) > BUFSIZE - 4)
+               {
+                       /* remove trailing space */
+                       *mbuf = '\0';
+                       *(pbuf - 1) = '\0';
+
+                       sendto_channel_local(mems, chptr, "%s %s", lmodebuf, lparabuf);
+
+                       cur_len = mlen;
+                       mbuf = lmodebuf + mlen;
+                       pbuf = lparabuf;
+                       count = 0;
+               }
+
+               *mbuf++ = c;
+               cur_len += plen;
+               pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr);
+               count++;
+
+               free_ban(banptr);
+       }
+
+       *mbuf = '\0';
+       *(pbuf - 1) = '\0';
+       sendto_channel_local(mems, chptr, "%s %s", lmodebuf, lparabuf);
+
+       list->head = list->tail = NULL;
+       list->length = 0;
+}