Merge.

TODO-SHADOW

@@ -3,5 +3,4 @@ Todo list for ShadowIRCd 6.2
 * modesetize umodes
 * global/remote SET, via shared block flag.
 * on the fly dnsbl exceptions
-* implementation to change other users' umodes (if you're a oper of course)
 * evaluate snotes and possibly make a lot more netwide .

configure

@@ -7852,7 +7852,7 @@ $as_echo "$as_me: WARNING: NICKLEN has a hard limit of 50. Setting NICKLEN=50" >
   fi
 
 else
-  NICKLEN=31
+  NICKLEN=30
 fi
 
 

configure.ac

@@ -873,7 +873,7 @@ AC_HELP_STRING([--with-nicklen=LENGTH],[Set the nick length to LENGTH (default 3
   else
 	NICKLEN="$withval"
   fi
-], [NICKLEN=31])
+], [NICKLEN=30])
 
 AC_ARG_WITH(topiclen,           
 AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (default 390, max 390)]),

doc/example.conf

@@ -519,6 +519,7 @@ general {
 	#static_quit = "I like turtles!";
 	servicestring = "is a Network Service";
 	disable_fake_channels = no;
+	hide_channel_below_users = 3;
         tkline_expire_notices = no;
         default_floodcount = 10;
 	failed_oper_notice = yes;

doc/reference.conf

@@ -1108,6 +1108,12 @@ general {
 	 */
 	disable_fake_channels = no;
 
+	/* hide_channel_below_users: Amount of users a channel must have in it
+	 * before it is shown in a standard LIST. This can be overridden by
+	 * invoking LIST like: /LIST <3
+	 */
+	hide_channel_below_users = 3;
+
         /* tkline_expire_notices: give a notice to opers when a tkline
          * expires
          */

include/s_conf.h

@@ -166,6 +166,7 @@ struct config_file_entry
 
 	unsigned char compression_level;
 	int disable_fake_channels;
+	int hide_channel_below_users;
 	int dots_in_ident;
 	int failed_oper_notice;
 	int anti_nick_flood;

modules/m_info.c

@@ -150,6 +150,12 @@ static struct InfoStruct info_table[] = {
 		&ConfigFileEntry.default_floodcount,
 		"Startup value of FLOODCOUNT",
 	},
+	{
+		"hide_channel_below_users",
+		OUTPUT_DECIMAL,
+		&ConfigFileEntry.hide_channel_below_users,
+		"Hide channels below this many users in standard /LIST output",
+	},
 	{
 		"default_adminstring",
 		OUTPUT_STRING,

modules/m_list.c

@@ -152,8 +152,8 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
 		return 0;
 	}
 
-	/* XXX rather arbitrary -- jilles */
-	params.users_min = 3;
+	/* Let the user set it */
+	params.users_min = ConfigFileEntry.hide_channel_below_users;
 	params.users_max = INT_MAX;
 
 	if (parc > 1 && parv[1] != NULL && !IsChannelName(parv[1]))

src/newconf.c

@@ -2201,6 +2201,7 @@ static struct ConfEntry conf_general_table[] =
 	{ "anti_spam_exit_message_time", CF_TIME,  NULL, 0, &ConfigFileEntry.anti_spam_exit_message_time },
 	{ "use_part_messages",		CF_YESNO, NULL, 0, &ConfigFileEntry.use_part_messages	},
 	{ "disable_fake_channels",	 CF_YESNO, NULL, 0, &ConfigFileEntry.disable_fake_channels },
+	{ "hide_channel_below_users", CF_INT, NULL, 0, &ConfigFileEntry.hide_channel_below_users },
 	{ "min_nonwildcard_simple",	 CF_INT,   NULL, 0, &ConfigFileEntry.min_nonwildcard_simple },
 	{ "non_redundant_klines",	 CF_YESNO, NULL, 0, &ConfigFileEntry.non_redundant_klines },
 	{ "tkline_expire_notices",	 CF_YESNO, NULL, 0, &ConfigFileEntry.tkline_expire_notices },

src/s_auth.c

@@ -20,7 +20,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
+ */
 
 /*
  * Changes:

src/s_conf.c

@@ -698,6 +698,7 @@ set_default_conf(void)
 	ConfigFileEntry.failed_oper_notice = YES;
 	ConfigFileEntry.anti_nick_flood = NO;
 	ConfigFileEntry.disable_fake_channels = NO;
+	ConfigFileEntry.hide_channel_below_users = 3;
 	ConfigFileEntry.max_nick_time = 20;
 	ConfigFileEntry.max_nick_changes = 5;
 	ConfigFileEntry.max_accept = 20;