Remove channel::use_forward setting. It's unconditionally enabled

Author: Stephen Bennett

include/s_conf.h

@@ -227,7 +227,6 @@ struct config_channel_entry
 	int use_except;
 	int use_invex;
 	int use_knock;
-	int use_forward;
 	int knock_delay;
 	int knock_delay_channel;
 	int max_bans;

modules/core/m_join.c

@@ -1135,7 +1135,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 		len = rb_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))
 	{
 		if(dir != MODE_ADD)
 		{

modules/m_info.c

@@ -566,12 +566,6 @@ static struct InfoStruct info_table[] = {
 		&ConfigChannel.use_invex,
 		"Enable chanmode +I (invite exceptions)",
 	},
-	{
-		"use_forward",
-		OUTPUT_BOOLEAN_YN,
-		&ConfigChannel.use_forward,
-		"Enable chanmode +f (channel forwarding)",
-	},
 	{
 		"use_knock",
 		OUTPUT_BOOLEAN_YN,

scripts/makerelease.sh

@@ -8,7 +8,7 @@ else
 fi
 
 if [ "x$2" = "x" ]; then
-    COMMIT=master
+    COMMIT=HEAD
 else
     COMMIT=$2
 fi

src/channel.c

@@ -1142,7 +1142,7 @@ channel_modes(struct Channel *chptr, struct Client *client_p)
 					   chptr->mode.join_time);
 	}
 
-	if(*chptr->mode.forward && (ConfigChannel.use_forward || !IsClient(client_p)))
+	if(*chptr->mode.forward)
 	{
 		*mbuf++ = 'f';
 

src/chmode.c

@@ -118,14 +118,6 @@ construct_noparam_modes(void)
 
 		switch (chmode_flags[i])
 		{
-		    case MODE_EXLIMIT:
-		    case MODE_DISFORWARD:
-			if(ConfigChannel.use_forward)
-			{
-			    *ptr++ = (char) i;
-			}
-			
-			break;
 		    case MODE_REGONLY:
 			if(rb_dlink_list_length(&service_list))
 			{
@@ -530,11 +522,6 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
 	/* setting + */
 	if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
 	{
-		/* if +f is disabled, ignore an attempt to set +QF locally */
-		if(!ConfigChannel.use_forward && MyClient(source_p) &&
-		   (c == 'Q' || c == 'F'))
-			return;
-
 		chptr->mode.mode |= mode_type;
 
 		mode_changes[mode_count].letter = c;
@@ -1201,11 +1188,6 @@ chm_forward(struct Client *source_p, struct Channel *chptr,
 	struct membership *msptr;
 	const char *forward;
 
-	/* if +f is disabled, ignore local attempts to set it */
-	if(!ConfigChannel.use_forward && MyClient(source_p) &&
-	   (dir == MODE_ADD) && (parc > *parn))
-		return;
-
 	if(dir == MODE_QUERY || (dir == MODE_ADD && parc <= *parn))
 	{
 		if (!(*errors & SM_ERR_RPL_F))
@@ -1284,7 +1266,7 @@ chm_forward(struct Client *source_p, struct Channel *chptr,
 		mode_changes[mode_count].dir = MODE_ADD;
 		mode_changes[mode_count].caps = 0;
 		mode_changes[mode_count].nocaps = 0;
-		mode_changes[mode_count].mems = ConfigChannel.use_forward ? ALL_MEMBERS : ONLY_SERVERS;
+		mode_changes[mode_count].mems = ALL_MEMBERS;
 		mode_changes[mode_count].id = NULL;
 		mode_changes[mode_count++].arg = forward;
 	}

src/newconf.c

@@ -2184,7 +2184,6 @@ static struct ConfEntry conf_channel_table[] =
 	{ "use_except",		CF_YESNO, NULL, 0, &ConfigChannel.use_except		},
 	{ "use_invex",		CF_YESNO, NULL, 0, &ConfigChannel.use_invex		},
 	{ "use_knock",		CF_YESNO, NULL, 0, &ConfigChannel.use_knock		},
-	{ "use_forward",	CF_YESNO, NULL, 0, &ConfigChannel.use_forward		},
 	{ "\0", 		0, 	  NULL, 0, NULL }
 };
 

src/s_conf.c

@@ -792,7 +792,6 @@ set_default_conf(void)
 	ConfigChannel.use_except = YES;
 	ConfigChannel.use_invex = YES;
 	ConfigChannel.use_knock = YES;
-	ConfigChannel.use_forward = YES;
 	ConfigChannel.knock_delay = 300;
 	ConfigChannel.knock_delay_channel = 60;
 	ConfigChannel.max_chans_per_user = 15;

src/s_user.c

@@ -1057,11 +1057,6 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 			}
 			/* FALLTHROUGH */
 		default:
-			if (MyConnect(source_p) && *pm == 'Q' && !ConfigChannel.use_forward) {
-				badflag = YES;
-				break;
-			}
-
 			if((flag = user_modes[(unsigned char) *pm]))
 			{
 				if(MyConnect(source_p)

src/supported.c

@@ -210,10 +210,9 @@ isupport_chanmodes(const void *ptr)
 {
 	static char result[80];
 
-	rb_snprintf(result, sizeof result, "%s%sbq,k,%slj,%s",
+	rb_snprintf(result, sizeof result, "%s%sbq,k,flj,%s",
 			ConfigChannel.use_except ? "e" : "",
 			ConfigChannel.use_invex ? "I" : "",
-			ConfigChannel.use_forward ? "f" : "",
 			cflagsbuf);
 	return result;
 }