X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/095efcf0fc054a9cedcb14155058f7371e1ff178..de36941445d328fd7038589b70422a3a766fe3f7:/modules/core/m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 5f8b9811..ae75f86f 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -20,14 +20,11 @@
  *  along with this program; if not, write to the Free Software
  *  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 "channel.h"
 #include "client.h"
-#include "common.h"
 #include "hash.h"
 #include "match.h"
 #include "ircd.h"
@@ -41,21 +38,25 @@
 #include "modules.h"
 #include "packet.h"
 #include "chmode.h"
+#include "ratelimit.h"
+#include "s_assert.h"
+
+static const char join_desc[] = "Provides the JOIN and TS6 SJOIN commands to facilitate joining and creating channels";
 
-static int m_join(struct Client *, struct Client *, int, const char **);
-static int ms_join(struct Client *, struct Client *, int, const char **);
-static int ms_sjoin(struct Client *, struct Client *, int, const char **);
+static void m_join(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_join(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_sjoin(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 static int h_can_create_channel;
 static int h_channel_join;
 
 struct Message join_msgtab = {
-	"JOIN", 0, 0, 0, MFLG_SLOW,
+	"JOIN", 0, 0, 0, 0,
 	{mg_unreg, {m_join, 2}, {ms_join, 2}, mg_ignore, mg_ignore, {m_join, 2}}
 };
 
 struct Message sjoin_msgtab = {
-	"SJOIN", 0, 0, 0, MFLG_SLOW,
+	"SJOIN", 0, 0, 0, 0,
 	{mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 4}, mg_ignore, mg_ignore}
 };
 
@@ -67,56 +68,67 @@ mapi_hlist_av1 join_hlist[] = {
 	{ NULL, NULL },
 };
 
-DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3494 $");
+DECLARE_MODULE_AV2(join, NULL, NULL, join_clist, join_hlist, NULL, NULL, NULL, join_desc);
 
 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);
+static bool check_channel_name_loc(struct Client *source_p, const char *name);
+static void send_join_error(struct Client *source_p, int numeric, const char *name);
 
-static void set_final_mode(struct Mode *mode, struct Mode *oldmode);
+static char *set_final_mode(char *mbuf, char *parabuf, 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 parabuf[MODEBUFLEN];
-static const char *para[MAXMODEPARAMS];
-static char *mbuf;
-static int pargs;
-
 /* 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)
+	     char *key, int *err)
 {
 	int depth = 0, i;
+	const char *next = NULL;
+
+	/* The caller (m_join) is only interested in the reason
+	 * for the original channel.
+	 */
+	if ((*err = can_join(source_p, chptr, key, &next)) == 0)
+		return chptr;
 
-	/* User is +Q */
-	if (IsNoForward(source_p))
+	/* User is +Q, or forwarding disabled */
+	if (IsNoForward(source_p) || !ConfigChannel.use_forward)
 		return NULL;
 
 	while (depth < 16)
 	{
-		chptr = find_channel(chptr->mode.forward);
+		if (next == NULL)
+			return NULL;
+
+		chptr = find_channel(next);
 		/* Can only forward to existing channels */
 		if (chptr == NULL)
 			return NULL;
-		/* Already on there, show original error message */
+		/* Already on there... but don't send the original reason for
+		 * being unable to join. It isn't their fault they're already
+		 * on the channel, and it looks hostile otherwise.
+		 * --Elizafox
+		 */
 		if (IsMember(source_p, chptr))
+		{
+			*err = ERR_USERONCHANNEL; /* I'm borrowing this for now. --Elizafox */
 			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);
+
+		i = can_join(source_p, chptr, key, &next);
 		if (i == 0)
 			return chptr;
-		if (i != ERR_INVITEONLYCHAN && i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_CHANNELISFULL)
-			return NULL;
 		depth++;
 	}
 
@@ -125,15 +137,14 @@ check_forward(struct Client *source_p, struct Channel *chptr,
 
 /*
  * 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 void
+m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	static char jbuf[BUFSIZE];
-	struct Channel *chptr = NULL;
+	struct Channel *chptr = NULL, *chptr2 = NULL;
 	struct ConfItem *aconf;
 	char *name;
 	char *key = NULL;
@@ -142,7 +153,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	char *p = NULL, *p2 = NULL;
 	char *chanlist;
 	char *mykey;
-	int successful_join_count = 0;	/* Number of channels successfully joined */
 
 	jbuf[0] = '\0';
 
@@ -163,12 +173,12 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		/* join 0 parts all channels */
 		if(*name == '0' && (name[1] == ',' || name[1] == '\0') && name == chanlist)
 		{
-			(void) strcpy(jbuf, "0");
+			rb_strlcpy(jbuf, "0", sizeof(jbuf));
 			continue;
 		}
 
-		/* check it begins with # or &, and local chans are disabled */
-		else if(!IsChannelName(name))
+		/* check it begins with a valid channel prefix per policy. */
+		else if (!IsChannelName(name))
 		{
 			sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 					   form_str(ERR_NOSUCHCHANNEL), name);
@@ -249,8 +259,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 			if(moduledata.approved != 0)
 			{
-				sendto_one(source_p, form_str(moduledata.approved),
-					   me.name, source_p->name, name);
+				if(moduledata.approved != ERR_CUSTOM)
+					send_join_error(source_p,
+							moduledata.approved,
+							name);
 				continue;
 			}
 
@@ -267,20 +279,15 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 		if((rb_dlink_list_length(&source_p->user->channel) >=
 		    (unsigned long) ConfigChannel.max_chans_per_user) &&
-		   (!IsOper(source_p) ||
+		   (!IsExtendChans(source_p) ||
 		    (rb_dlink_list_length(&source_p->user->channel) >=
-		     (unsigned long) ConfigChannel.max_chans_per_user * 3)))
+		     (unsigned long) ConfigChannel.max_chans_per_user_large)))
 		{
 			sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
 				   me.name, source_p->name, name);
-			if(successful_join_count)
-				source_p->localClient->last_join_time = rb_current_time();
-			return 0;
+			continue;
 		}
 
-		if(flags == 0)	/* if channel doesn't exist, don't penalize */
-			successful_join_count++;
-
 		if(chptr == NULL)	/* If I already have a chptr, no point doing this */
 		{
 			chptr = get_or_create_channel(source_p, name, NULL);
@@ -289,35 +296,29 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			{
 				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 check_forward returns NULL, they couldn't join and there wasn't a usable forward channel. */
+		if((chptr2 = check_forward(source_p, chptr, key, &i)) == NULL)
 		{
-			if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
-			    (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))
-			{
-				/* might be wrong, but is there any other better location for such?
-				 * see extensions/chm_operonly.c for other comments on this
-				 * -- dwr
-				 */
-				if(i != ERR_CUSTOM)
-					sendto_one(source_p, form_str(i), me.name, source_p->name, name);
+			/* might be wrong, but is there any other better location for such?
+			 * see extensions/chm_operonly.c for other comments on this
+			 * -- dwr
+			 */
+			if(i != ERR_CUSTOM)
+				send_join_error(source_p, i, name);
+			continue;
+		}
+		else if(chptr != chptr2)
+			sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr2->chname);
 
-				if(successful_join_count > 0)
-					successful_join_count--;
-				continue;
-			}
+		chptr = chptr2;
 
-			sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
-		}
+		if(flags == 0 &&
+				!IsOper(source_p) && !IsExemptSpambot(source_p))
+			check_spambot_warning(source_p, name);
 
 		/* add the user to the channel */
 		add_user_to_channel(chptr, source_p, flags);
@@ -329,32 +330,28 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		}
 		chptr->join_count++;
 
+		/* credit user for join */
+		credit_client_join(source_p);
+
 		/* 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);
+		send_channel_join(chptr, source_p);
 
 		/* its a new channel, set +nt and burst. */
 		if(flags & CHFL_CHANOP)
 		{
 			chptr->channelts = rb_current_time();
-			chptr->mode.mode |= MODE_TOPICLIMIT;
-			chptr->mode.mode |= MODE_NOPRIVMSGS;
+			chptr->mode.mode |= ConfigChannel.autochanmodes;
 			modes = channel_modes(chptr, &me);
 
 			sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s",
 					     me.name, chptr->chname, modes);
 
-			if(*chptr->chname == '#')
-			{
-				sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
-					      ":%s SJOIN %ld %s %s :@%s",
-					      me.id, (long) chptr->channelts,
-					      chptr->chname, modes,
-					      source_p->id);
-			}
+			sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+				      ":%s SJOIN %ld %s %s :@%s",
+				      me.id, (long) chptr->channelts,
+				      chptr->chname, modes, source_p->id);
 		}
 		else
 		{
@@ -373,82 +370,67 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 			sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
 				   me.name, source_p->name, chptr->chname,
-				   chptr->topic_info, chptr->topic_time);
+				   chptr->topic_info,
+				   (unsigned long)chptr->topic_time);
 		}
 
 		channel_member_names(chptr, source_p, 1);
 
-		if(successful_join_count)
-			source_p->localClient->last_join_time = rb_current_time();
-
 		hook_info.client = source_p;
 		hook_info.chptr = chptr;
 		hook_info.key = key;
 		call_hook(h_channel_join, &hook_info);
 	}
-
-	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[])
+static void
+ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
+	static char modebuf[MODEBUFLEN];
+	static char parabuf[MODEBUFLEN];
 	struct Channel *chptr;
 	static struct Mode mode;
 	time_t oldts;
 	time_t newts;
-	int isnew;
-	int keep_our_modes = YES;
-	int keep_new_modes = YES;
+	bool isnew;
+	bool keep_our_modes = true;
 	rb_dlink_node *ptr, *next_ptr;
+	char *mbuf;
 
 	/* special case for join 0 */
 	if((parv[1][0] == '0') && (parv[1][1] == '\0') && parc == 2)
 	{
 		do_join_0(client_p, source_p);
-		return 0;
+		return;
 	}
 
 	if(parc < 4)
-		return 0;
+		return;
 
 	if(!IsChannelName(parv[2]) || !check_channel_name(parv[2]))
-		return 0;
+		return;
 
 	/* joins for local channels cant happen. */
 	if(parv[2][0] == '&')
-		return 0;
+		return;
 
 	mbuf = modebuf;
 	mode.key[0] = mode.forward[0] = '\0';
 	mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
 
 	if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
-		return 0;
+		return;
 
 	newts = atol(parv[1]);
 	oldts = chptr->channelts;
 
-#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
 	/* making a channel TS0 */
 	if(!isnew && !newts && oldts)
 	{
@@ -459,7 +441,6 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 				     "Server %s changing TS on %s from %ld to 0",
 				     source_p->name, chptr->chname, (long) oldts);
 	}
-#endif
 
 	if(isnew)
 		chptr->channelts = newts;
@@ -469,16 +450,14 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 		;
 	else if(newts < oldts)
 	{
-		keep_our_modes = NO;
+		keep_our_modes = false;
 		chptr->channelts = newts;
 	}
-	else
-		keep_new_modes = NO;
 
 	/* Lost the TS, other side wins, so remove modes on this side */
 	if(!keep_our_modes)
 	{
-		set_final_mode(&mode, &chptr->mode);
+		mbuf = set_final_mode(mbuf, parabuf, &mode, &chptr->mode);
 		chptr->mode = mode;
 		remove_our_modes(chptr, source_p);
 		RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
@@ -500,6 +479,9 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 					     source_p->servptr->name,
 					     chptr->chname, modebuf, parabuf);
 		*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))
@@ -512,20 +494,19 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 			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);
+		send_channel_join(chptr, source_p);
 	}
 
 	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 void
+ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
+	static char modebuf[MODEBUFLEN];
+	static char parabuf[MODEBUFLEN];
 	static char buf_uid[BUFSIZE];
 	static const char empty_modes[] = "0";
 	struct Channel *chptr;
@@ -535,12 +516,11 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	static struct Mode mode, *oldmode;
 	const char *modes;
 	int args = 0;
-	int keep_our_modes = 1;
-	int keep_new_modes = 1;
+	bool keep_our_modes = true;
+	bool keep_new_modes = true;
 	int fl;
-	int isnew;
+	bool isnew;
 	int mlen_uid;
-	int len_nick;
 	int len_uid;
 	int len;
 	int joins = 0;
@@ -550,13 +530,19 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	int i, joinc = 0, timeslice = 0;
 	static char empty[] = "";
 	rb_dlink_node *ptr, *next_ptr;
+	char *mbuf;
+	int pargs;
+	const char *para[MAXMODEPARAMS];
+
+	if(parc < 5)
+		return;
 
 	if(!IsChannelName(parv[2]) || !check_channel_name(parv[2]))
-		return 0;
+		return;
 
 	/* SJOIN's for local channels can't happen. */
 	if(*parv[2] == '&')
-		return 0;
+		return;
 
 	modebuf[0] = parabuf[0] = mode.key[0] = mode.forward[0] = '\0';
 	pargs = mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
@@ -579,7 +565,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			rb_strlcpy(mode.forward, parv[4 + args], sizeof(mode.forward));
 			args++;
 			if(parc < 5 + args)
-				return 0;
+				return;
 			break;
 		case 'j':
 			sscanf(parv[4 + args], "%d:%d", &joinc, &timeslice);
@@ -587,19 +573,19 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			mode.join_num = joinc;
 			mode.join_time = timeslice;
 			if(parc < 5 + args)
-				return 0;
+				return;
 			break;
 		case 'k':
 			rb_strlcpy(mode.key, parv[4 + args], sizeof(mode.key));
 			args++;
 			if(parc < 5 + args)
-				return 0;
+				return;
 			break;
 		case 'l':
 			mode.limit = atoi(parv[4 + args]);
 			args++;
 			if(parc < 5 + args)
-				return 0;
+				return;
 			break;
 		default:
 			if(chmode_flags[(int) *s] != 0)
@@ -621,22 +607,12 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		s = "";
 
 	if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
-		return 0;	/* channel name too long? */
+		return;	/* 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,
@@ -647,11 +623,10 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 				     "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)
@@ -660,12 +635,15 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		/* If configured, kick people trying to join +i/+k
 		 * channels by recreating them on split servers.
-		 * Don't kick if the source has sent EOB (services
-		 * deopping everyone by TS-1 SJOIN).
+		 * 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) ||
+				((!HasSentEob(source_p) &&
+				mode.mode & MODE_INVITEONLY) ||
 		    (mode.key[0] != 0 && irccmp(mode.key, oldmode->key) != 0)))
 		{
 			struct membership *msptr;
@@ -691,16 +669,16 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			{
 				/* Channel was emptied, create a new one */
 				if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
-					return 0;		/* oops! */
+					return;		/* oops! */
 
 				oldmode = &chptr->mode;
 			}
 		}
-		keep_our_modes = NO;
+		keep_our_modes = false;
 		chptr->channelts = newts;
 	}
 	else
-		keep_new_modes = NO;
+		keep_new_modes = false;
 
 	if(!keep_new_modes)
 		mode = *oldmode;
@@ -710,7 +688,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		if(oldmode->limit > mode.limit)
 			mode.limit = oldmode->limit;
 		if(strcmp(mode.key, oldmode->key) < 0)
-			strcpy(mode.key, oldmode->key);
+			rb_strlcpy(mode.key, oldmode->key, sizeof(mode.key));
 		if(oldmode->join_num > mode.join_num ||
 				(oldmode->join_num == mode.join_num &&
 				 oldmode->join_time > mode.join_time))
@@ -719,7 +697,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			mode.join_time = oldmode->join_time;
 		}
 		if(irccmp(mode.forward, oldmode->forward) < 0)
-			strcpy(mode.forward, oldmode->forward);
+			rb_strlcpy(mode.forward, oldmode->forward, sizeof(mode.forward));
 	}
 	else
 	{
@@ -728,7 +706,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			chptr->join_count = chptr->join_delta = 0;
 	}
 
-	set_final_mode(&mode, oldmode);
+	mbuf = set_final_mode(mbuf, parabuf, &mode, oldmode);
 	chptr->mode = mode;
 
 	/* Lost the TS, other side wins, so remove modes on this side */
@@ -760,6 +738,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		/* 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')
@@ -773,17 +754,14 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	else
 		modes = empty_modes;
 
-	/* working on the presumption eventually itll be more efficient to
-	 * build a TS6 buffer without checking its needed..
-	 */
-	mlen_uid = rb_sprintf(buf_uid, ":%s SJOIN %ld %s %s :",
+	mlen_uid = 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;
 	para[0] = para[1] = para[2] = para[3] = empty;
 	pargs = 0;
-	len_nick = len_uid = 0;
+	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
@@ -835,19 +813,17 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			if(fl & CHFL_CHANOP)
 			{
 				*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));
+		len = sprintf(ptr_uid, "%s ", use_id(target_p));
 		ptr_uid += len;
 		len_uid += len;
 
@@ -857,9 +833,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		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]);
+			send_channel_join(chptr, target_p);
 			joins++;
 		}
 
@@ -947,7 +921,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		destroy_channel(chptr);
 
-		return 0;
+		return;
 	}
 
 	/* Keep the colon if we're sending an SJOIN without nicks -- jilles */
@@ -957,8 +931,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	}
 
 	sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
-
-	return 0;
 }
 
 /*
@@ -968,8 +940,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
  * 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)
@@ -984,12 +954,12 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 
 	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
 
-	if(source_p->user->channel.head && MyConnect(source_p) &&
-	   !IsOper(source_p) && !IsExemptSpambot(source_p))
-		check_spambot_warning(source_p, NULL);
-
 	while((ptr = source_p->user->channel.head))
 	{
+		if(MyConnect(source_p) &&
+		   !IsOper(source_p) && !IsExemptSpambot(source_p))
+			check_spambot_warning(source_p, NULL);
+
 		msptr = ptr->data;
 		chptr = msptr->chptr;
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
@@ -999,35 +969,78 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 	}
 }
 
-static int
+static bool
 check_channel_name_loc(struct Client *source_p, const char *name)
 {
+	const char *p;
+
 	s_assert(name != NULL);
 	if(EmptyString(name))
-		return 0;
+		return false;
 
 	if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
 	{
-		for(; *name; ++name)
+		for(p = name; *p; ++p)
 		{
-			if(!IsChanChar(*name) || IsFakeChanChar(*name))
-				return 0;
+			if(!IsChanChar(*p) || IsFakeChanChar(*p))
+				return false;
 		}
 	}
 	else
 	{
-		for(; *name; ++name)
+		for(p = name; *p; ++p)
 		{
-			if(!IsChanChar(*name))
-				return 0;
+			if(!IsChanChar(*p))
+				return false;
 		}
 	}
 
-	return 1;
+	if(ConfigChannel.only_ascii_channels)
+	{
+		for(p = name; *p; ++p)
+			if(*p < 33 || *p > 126)
+				return false;
+	}
+
+	return true;
 }
 
+/* send_join_error()
+ *
+ * input	- client to send to, reason, channel name
+ * output	- none
+ * side effects - error message sent to client
+ */
 static void
-set_final_mode(struct Mode *mode, struct Mode *oldmode)
+send_join_error(struct Client *source_p, int numeric, const char *name)
+{
+	/* This stuff is necessary because the form_str macro only
+	 * accepts constants.
+	 */
+	switch (numeric)
+	{
+#define NORMAL_NUMERIC(i)						\
+		case i:							\
+			sendto_one(source_p, form_str(i),		\
+					me.name, source_p->name, name);	\
+			break
+
+		NORMAL_NUMERIC(ERR_BANNEDFROMCHAN);
+		NORMAL_NUMERIC(ERR_INVITEONLYCHAN);
+		NORMAL_NUMERIC(ERR_BADCHANNELKEY);
+		NORMAL_NUMERIC(ERR_CHANNELISFULL);
+		NORMAL_NUMERIC(ERR_NEEDREGGEDNICK);
+		NORMAL_NUMERIC(ERR_THROTTLE);
+
+		default:
+			sendto_one_numeric(source_p, numeric,
+					"%s :Cannot join channel", name);
+			break;
+	}
+}
+
+static char *
+set_final_mode(char *mbuf, char *parabuf, struct Mode *mode, struct Mode *oldmode)
 {
 	int dir = MODE_QUERY;
 	char *pbuf = parabuf;
@@ -1079,7 +1092,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			dir = MODE_DEL;
 		}
 		*mbuf++ = 'k';
-		len = rb_sprintf(pbuf, "%s ", oldmode->key);
+		len = sprintf(pbuf, "%s ", oldmode->key);
 		pbuf += len;
 	}
 	if(oldmode->join_num && !mode->join_num)
@@ -1108,7 +1121,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			dir = MODE_ADD;
 		}
 		*mbuf++ = 'l';
-		len = rb_sprintf(pbuf, "%d ", mode->limit);
+		len = sprintf(pbuf, "%d ", mode->limit);
 		pbuf += len;
 	}
 	if(mode->key[0] && strcmp(oldmode->key, mode->key))
@@ -1119,7 +1132,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			dir = MODE_ADD;
 		}
 		*mbuf++ = 'k';
-		len = rb_sprintf(pbuf, "%s ", mode->key);
+		len = sprintf(pbuf, "%s ", mode->key);
 		pbuf += len;
 	}
 	if(mode->join_num && (oldmode->join_num != mode->join_num || oldmode->join_time != mode->join_time))
@@ -1130,10 +1143,11 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			dir = MODE_ADD;
 		}
 		*mbuf++ = 'j';
-		len = rb_sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
+		len = sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
 		pbuf += len;
 	}
-	if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && ConfigChannel.use_forward)
+	if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) &&
+			ConfigChannel.use_forward)
 	{
 		if(dir != MODE_ADD)
 		{
@@ -1141,18 +1155,20 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			dir = MODE_ADD;
 		}
 		*mbuf++ = 'f';
-		len = rb_sprintf(pbuf, "%s ", mode->forward);
+		len = sprintf(pbuf, "%s ", mode->forward);
 		pbuf += len;
 	}
 	*mbuf = '\0';
+
+	return mbuf;
 }
 
 /*
  * remove_our_modes
  *
  * inputs	-
- * output	- 
- * side effects	- 
+ * output	-
+ * side effects	-
  */
 static void
 remove_our_modes(struct Channel *chptr, struct Client *source_p)
@@ -1163,8 +1179,8 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
 	char *lpara[MAXMODEPARAMS];
 	int count = 0;
 	int i;
+	char *mbuf = lmodebuf;
 
-	mbuf = lmodebuf;
 	*mbuf++ = '-';
 
 	for(i = 0; i < MAXMODEPARAMS; i++)
@@ -1188,7 +1204,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]);
 
@@ -1220,7 +1236,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++ = '-';
@@ -1236,7 +1252,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],
@@ -1263,10 +1279,11 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 	char *pbuf;
 	int count = 0;
 	int cur_len, mlen, plen;
+	char *mbuf;
 
 	pbuf = lparabuf;
 
-	cur_len = mlen = rb_sprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname);
+	cur_len = mlen = sprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname);
 	mbuf = lmodebuf + mlen;
 
 	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
@@ -1274,7 +1291,8 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 		banptr = ptr->data;
 
 		/* trailing space, and the mode letter itself */
-		plen = strlen(banptr->banstr) + 2;
+		plen = strlen(banptr->banstr) +
+			(banptr->forward ? strlen(banptr->forward) + 1 : 0) + 2;
 
 		if(count >= MAXMODEPARAMS || (cur_len + plen) > BUFSIZE - 4)
 		{
@@ -1292,7 +1310,10 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 
 		*mbuf++ = c;
 		cur_len += plen;
-		pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr);
+		if (banptr->forward)
+			pbuf += sprintf(pbuf, "%s$%s ", banptr->banstr, banptr->forward);
+		else
+			pbuf += sprintf(pbuf, "%s ", banptr->banstr);
 		count++;
 
 		free_ban(banptr);