X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/d3f6b808677ba8bd3fa48f9bd61b99a2292a8c3e..6485005214c12ef94a50096e96478804b9cef556:/modules/m_stats.c

diff --git a/modules/m_stats.c b/modules/m_stats.c
index afaea433..49588aa1 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -46,6 +46,7 @@
 #include "whowas.h"
 #include "rb_radixtree.h"
 #include "sslproc.h"
+#include "s_assert.h"
 
 static const char stats_desc[] =
 	"Provides the STATS command to inspect various server/network information";
@@ -72,7 +73,7 @@ DECLARE_MODULE_AV2(stats, NULL, NULL, stats_clist, stats_hlist, NULL, NULL, NULL
 const char *Lformat = "%s %u %u %u %u %u :%u %u %s";
 
 static void stats_l_list(struct Client *s, const char *, bool, bool, rb_dlink_list *, char,
-				bool (*check_fn)(struct Client *target_p));
+				bool (*check_fn)(struct Client *source_p, struct Client *target_p));
 static void stats_l_client(struct Client *source_p, struct Client *target_p,
 				char statchar);
 
@@ -89,8 +90,8 @@ struct stats_cmd
 		handler_t handler;
 		handler_parv_t handler_parv;
 	};
+	const char *need_priv;
 	bool need_parv;
-	bool need_oper;
 	bool need_admin;
 };
 
@@ -103,7 +104,6 @@ static void stats_deny(struct Client *);
 static void stats_exempt(struct Client *);
 static void stats_events(struct Client *);
 static void stats_prop_klines(struct Client *);
-static void stats_hubleaf(struct Client *);
 static void stats_auth(struct Client *);
 static void stats_tklines(struct Client *);
 static void stats_klines(struct Client *);
@@ -115,11 +115,11 @@ static void stats_operedup(struct Client *);
 static void stats_ports(struct Client *);
 static void stats_tresv(struct Client *);
 static void stats_resv(struct Client *);
+static void stats_secure(struct Client *);
 static void stats_ssld(struct Client *);
 static void stats_usage(struct Client *);
 static void stats_tstats(struct Client *);
 static void stats_uptime(struct Client *);
-static void stats_shared(struct Client *);
 static void stats_servers(struct Client *);
 static void stats_tgecos(struct Client *);
 static void stats_gecos(struct Client *);
@@ -131,6 +131,11 @@ static void stats_ziplinks(struct Client *);
 static void stats_comm(struct Client *);
 static void stats_capability(struct Client *);
 
+#define HANDLER_NORM(fn, admin, priv) \
+		{ { .handler = fn }, .need_parv = false, .need_priv = priv, .need_admin = admin }
+#define HANDLER_PARV(fn, admin, priv) \
+		{ { .handler_parv = fn }, .need_parv = true, .need_priv = priv, .need_admin = admin }
+
 /* This table contains the possible stats items, in order:
  * stats letter,  function to call, operonly? adminonly? --fl_
  *
@@ -139,54 +144,51 @@ static void stats_capability(struct Client *);
  * --Elizafox
  */
 static struct stats_cmd stats_cmd_table[256] = {
-/*	letter	handler/handler_parv			parv	oper	admin	*/
-	['a'] = { { stats_dns_servers },		false,	true,	true,	},
-	['A'] = { { stats_dns_servers },		false,	true,	true,	},
-	['b'] = { { stats_delay },			false,	true,	true,	},
-	['B'] = { { stats_hash },			false,	true,	true,	},
-	['c'] = { { stats_connect },			false,	false,	false,	},
-	['C'] = { { stats_capability },			false,	true,	false,	},
-	['d'] = { { stats_tdeny },			false,	true,	false,	},
-	['D'] = { { stats_deny },			false,	true,	false,	},
-	['e'] = { { stats_exempt },			false,	true,	false,	},
-	['E'] = { { stats_events },			false,	true,	true,	},
-	['f'] = { { stats_comm },			false,	true,	true,	},
-	['F'] = { { stats_comm },			false,	true,	true,	},
-	['g'] = { { stats_prop_klines },		false,	true,	false,	},
-	['h'] = { { stats_hubleaf },			false,	false,	false,	},
-	['H'] = { { stats_hubleaf },			false,	false,	false,	},
-	['i'] = { { stats_auth },			false,	false,	false,	},
-	['I'] = { { stats_auth },			false,	false,	false,	},
-	['k'] = { { stats_tklines },			false,	false,	false,	},
-	['K'] = { { stats_klines },			false,	false,	false,	},
-	['l'] = { { .handler_parv = stats_ltrace },	true,	false,	false,	},
-	['L'] = { { .handler_parv = stats_ltrace },	true,	false,	false,	},
-	['m'] = { { stats_messages },			false,	false,	false,	},
-	['M'] = { { stats_messages },			false,	false,	false,	},
-	['n'] = { { stats_dnsbl },			false,	false,	false,	},
-	['o'] = { { stats_oper },			false,	false,	false,	},
-	['O'] = { { stats_privset },			false,	true,	false,	},
-	['p'] = { { stats_operedup },			false,	false,	false,	},
-	['P'] = { { stats_ports },			false,	false,	false,	},
-	['q'] = { { stats_tresv },			false,	true,	false,	},
-	['Q'] = { { stats_resv },			false,	true,	false,	},
-	['r'] = { { stats_usage },			false,	true,	false,	},
-	['R'] = { { stats_usage },			false,	true,	false,	},
-	['s'] = { { stats_ssld },			false,	true,	true,	},
-	['S'] = { { stats_ssld },			false,	true,	true,	},
-	['t'] = { { stats_tstats },			false,	true,	false,	},
-	['T'] = { { stats_tstats },			false,	true,	false,	},
-	['u'] = { { stats_uptime },			false,	false,	false,	},
-	['U'] = { { stats_shared },			false,	true,	false,	},
-	['v'] = { { stats_servers },			false,	false,	false,	},
-	['V'] = { { stats_servers },			false,	false,	false,	},
-	['x'] = { { stats_tgecos },			false,	true,	false,	},
-	['X'] = { { stats_gecos },			false,	true,	false,	},
-	['y'] = { { stats_class },			false,	false,	false,	},
-	['Y'] = { { stats_class },			false,	false,	false,	},
-	['z'] = { { stats_memory },			false,	true,	false,	},
-	['Z'] = { { stats_ziplinks },			false,	true,	false,	},
-	['?'] = { { stats_servlinks },			false,	false,	false,	},
+/*	letter               handler		admin	priv */
+	['a'] = HANDLER_NORM(stats_dns_servers,	true,	NULL),
+	['A'] = HANDLER_NORM(stats_dns_servers,	true,	NULL),
+	['b'] = HANDLER_NORM(stats_delay,	true,	NULL),
+	['B'] = HANDLER_NORM(stats_hash,	true,	NULL),
+	['c'] = HANDLER_NORM(stats_connect,	false,	NULL),
+	['C'] = HANDLER_NORM(stats_capability,	false,	"oper:general"),
+	['d'] = HANDLER_NORM(stats_tdeny,	false,	"oper:general"),
+	['D'] = HANDLER_NORM(stats_deny,	false,	"oper:general"),
+	['e'] = HANDLER_NORM(stats_exempt,	false,	"oper:general"),
+	['E'] = HANDLER_NORM(stats_events,	true,	NULL),
+	['f'] = HANDLER_NORM(stats_comm,	true,	NULL),
+	['F'] = HANDLER_NORM(stats_comm,	true,	NULL),
+	['g'] = HANDLER_NORM(stats_prop_klines,	false,	"oper:general"),
+	['i'] = HANDLER_NORM(stats_auth,	false,	NULL),
+	['I'] = HANDLER_NORM(stats_auth,	false,	NULL),
+	['k'] = HANDLER_NORM(stats_tklines,	false,	NULL),
+	['K'] = HANDLER_NORM(stats_klines,	false,	NULL),
+	['l'] = HANDLER_PARV(stats_ltrace,	false,	NULL),
+	['L'] = HANDLER_PARV(stats_ltrace,	false,	NULL),
+	['m'] = HANDLER_NORM(stats_messages,	false,	NULL),
+	['M'] = HANDLER_NORM(stats_messages,	false,	NULL),
+	['n'] = HANDLER_NORM(stats_dnsbl,	false,	NULL),
+	['o'] = HANDLER_NORM(stats_oper,	false,	NULL),
+	['O'] = HANDLER_NORM(stats_privset,	false,	"oper:privs"),
+	['p'] = HANDLER_NORM(stats_operedup,	false,	NULL),
+	['P'] = HANDLER_NORM(stats_ports,	false,	NULL),
+	['q'] = HANDLER_NORM(stats_tresv,	false,	"oper:general"),
+	['Q'] = HANDLER_NORM(stats_resv,	false,	"oper:general"),
+	['r'] = HANDLER_NORM(stats_usage,	false,	"oper:general"),
+	['R'] = HANDLER_NORM(stats_usage,	false,	"oper:general"),
+	['s'] = HANDLER_NORM(stats_secure,	false,	"oper:general"),
+	['S'] = HANDLER_NORM(stats_ssld,	true,	NULL),
+	['t'] = HANDLER_NORM(stats_tstats,	false,	"oper:general"),
+	['T'] = HANDLER_NORM(stats_tstats,	false,	"oper:general"),
+	['u'] = HANDLER_NORM(stats_uptime,	false,	NULL),
+	['v'] = HANDLER_NORM(stats_servers,	false,	NULL),
+	['V'] = HANDLER_NORM(stats_servers,	false,	NULL),
+	['x'] = HANDLER_NORM(stats_tgecos,	false,	"oper:general"),
+	['X'] = HANDLER_NORM(stats_gecos,	false,	"oper:general"),
+	['y'] = HANDLER_NORM(stats_class,	false,	NULL),
+	['Y'] = HANDLER_NORM(stats_class,	false,	NULL),
+	['z'] = HANDLER_NORM(stats_memory,	false,	"oper:general"),
+	['Z'] = HANDLER_NORM(stats_ziplinks,	false,	"oper:general"),
+	['?'] = HANDLER_NORM(stats_servlinks,	false,	NULL),
 };
 
 /*
@@ -208,7 +210,7 @@ m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
 	statchar = parv[1][0];
 
-	if(MyClient(source_p) && !IsOper(source_p))
+	if(MyClient(source_p) && !IsOperGeneral(source_p) && parc > 2)
 	{
 		/* Check the user is actually allowed to do /stats, and isnt flooding */
 		if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
@@ -224,7 +226,7 @@ m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 			last_used = rb_current_time();
 	}
 
-	if(hunt_server (client_p, source_p, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
+	if(hunt_server(client_p, source_p, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
 		return;
 
 	if(tolower(statchar) != 'l')
@@ -240,19 +242,26 @@ m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 	if(cmd->handler != NULL)
 	{
 		/* The stats table says what privs are needed, so check --fl_ */
-		/* Called for remote clients and for local opers, so check need_admin
-		 * and need_oper
-		 */
+		const char *missing_priv = NULL;
 		if(cmd->need_admin && !IsOperAdmin(source_p))
+			missing_priv = "admin";
+		else if(cmd->need_priv && !HasPrivilege(source_p, cmd->need_priv))
+			missing_priv = cmd->need_priv;
+
+		if(missing_priv != NULL)
 		{
-			sendto_one(source_p, form_str(ERR_NOPRIVS),
-				   me.name, source_p->name, "admin");
-			goto stats_out;
-		}
-		if(cmd->need_oper && !IsOper(source_p))
-		{
-			sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-					   form_str (ERR_NOPRIVILEGES));
+			if(!IsOper(source_p))
+			{
+				sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
+					form_str(ERR_NOPRIVILEGES));
+			}
+			else
+			{
+				if(!strncmp(missing_priv, "oper:", 5))
+					missing_priv += 5;
+				sendto_one(source_p, form_str(ERR_NOPRIVS),
+					me.name, source_p->name, missing_priv);
+			}
 			goto stats_out;
 		}
 
@@ -275,7 +284,7 @@ stats_dns_servers (struct Client *source_p)
 
 	RB_DLINK_FOREACH(n, nameservers.head)
 	{
-		sendto_one_numeric(source_p, RPL_STATSDEBUG, "A %s", (char *)n->data);
+		sendto_one_numeric(source_p, RPL_STATSDEBUG, "A :%s", (char *)n->data);
 	}
 }
 
@@ -311,14 +320,14 @@ stats_hash(struct Client *source_p)
 static void
 stats_connect(struct Client *source_p)
 {
-	static char buf[5];
+	static char buf[BUFSIZE];
 	struct server_conf *server_p;
 	char *s;
 	rb_dlink_node *ptr;
 
 	if((ConfigFileEntry.stats_c_oper_only ||
 	    (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
-	    !IsOper(source_p))
+	    !IsOperGeneral(source_p))
 	{
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str(ERR_NOPRIVILEGES));
@@ -334,10 +343,12 @@ stats_connect(struct Client *source_p)
 
 		s = buf;
 
-		if(IsOper(source_p))
+		if(IsOperGeneral(source_p))
 		{
 			if(ServerConfAutoconn(server_p))
 				*s++ = 'A';
+			if(ServerConfSCTP(server_p))
+				*s++ = 'M';
 			if(ServerConfSSL(server_p))
 				*s++ = 'S';
 			if(ServerConfTb(server_p))
@@ -355,7 +366,8 @@ stats_connect(struct Client *source_p)
 				form_str(RPL_STATSCLINE),
 				"*@127.0.0.1",
 				buf, server_p->name,
-				server_p->port, server_p->class_name);
+				server_p->port, server_p->class_name,
+				server_p->certfp ? server_p->certfp : "*");
 	}
 }
 
@@ -471,7 +483,8 @@ stats_exempt(struct Client *source_p)
 						   'e', host, pass, "", "");
 			}
 		}
-	}}
+	}
+}
 
 
 static void
@@ -512,47 +525,16 @@ stats_prop_klines(struct Client *source_p)
 	}
 }
 
-static void
-stats_hubleaf(struct Client *source_p)
-{
-	struct remote_conf *hub_p;
-	rb_dlink_node *ptr;
-
-	if((ConfigFileEntry.stats_h_oper_only ||
-	    (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
-	    !IsOper(source_p))
-	{
-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-				   form_str (ERR_NOPRIVILEGES));
-		return;
-	}
-
-	RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
-	{
-		hub_p = ptr->data;
-
-		if(hub_p->flags & CONF_HUB)
-			sendto_one_numeric(source_p, RPL_STATSHLINE,
-					form_str(RPL_STATSHLINE),
-					hub_p->host, hub_p->server);
-		else
-			sendto_one_numeric(source_p, RPL_STATSLLINE,
-					form_str(RPL_STATSLLINE),
-					hub_p->host, hub_p->server);
-	}
-}
-
-
 static void
 stats_auth (struct Client *source_p)
 {
 	/* Oper only, if unopered, return ERR_NOPRIVS */
-	if((ConfigFileEntry.stats_i_oper_only == 2) && !IsOper (source_p))
+	if((ConfigFileEntry.stats_i_oper_only == 2) && !IsOperGeneral (source_p))
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 
 	/* If unopered, Only return matching auth blocks */
-	else if((ConfigFileEntry.stats_i_oper_only == 1) && !IsOper (source_p))
+	else if((ConfigFileEntry.stats_i_oper_only == 1) && !IsOperGeneral (source_p))
 	{
 		struct ConfItem *aconf;
 		char *name, *host, *user, *classname;
@@ -591,12 +573,12 @@ static void
 stats_tklines(struct Client *source_p)
 {
 	/* Oper only, if unopered, return ERR_NOPRIVS */
-	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
+	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOperGeneral (source_p))
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 
 	/* If unopered, Only return matching klines */
-	else if((ConfigFileEntry.stats_k_oper_only == 1) && !IsOper (source_p))
+	else if((ConfigFileEntry.stats_k_oper_only == 1) && !IsOperGeneral (source_p))
 	{
 		struct ConfItem *aconf;
 		char *host, *pass, *user, *oper_reason;
@@ -621,7 +603,7 @@ stats_tklines(struct Client *source_p)
 		get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
 
 		sendto_one_numeric(source_p, RPL_STATSKLINE,
-				   form_str(RPL_STATSKLINE), aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
+				   form_str(RPL_STATSKLINE), (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
 				   host, user, pass, oper_reason ? "|" : "",
 				   oper_reason ? oper_reason : "");
 	}
@@ -693,12 +675,12 @@ static void
 stats_klines(struct Client *source_p)
 {
 	/* Oper only, if unopered, return ERR_NOPRIVS */
-	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
+	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOperGeneral (source_p))
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 
 	/* If unopered, Only return matching klines */
-	else if((ConfigFileEntry.stats_k_oper_only == 1) && !IsOper (source_p))
+	else if((ConfigFileEntry.stats_k_oper_only == 1) && !IsOperGeneral (source_p))
 	{
 		struct ConfItem *aconf;
 		char *host, *pass, *user, *oper_reason;
@@ -720,7 +702,7 @@ stats_klines(struct Client *source_p)
 		get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
 
 		sendto_one_numeric(source_p, RPL_STATSKLINE, form_str(RPL_STATSKLINE),
-				   aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
+				   (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
 				   host, user, pass, oper_reason ? "|" : "",
 				   oper_reason ? oper_reason : "");
 	}
@@ -734,7 +716,6 @@ stats_messages(struct Client *source_p)
 {
 	rb_dictionary_iter iter;
 	struct Message *msg;
-	struct alias_entry *amsg;
 
 	RB_DICTIONARY_FOREACH(msg, &iter, cmd_dict)
 	{
@@ -744,23 +725,18 @@ stats_messages(struct Client *source_p)
 				   msg->cmd, msg->count,
 				   msg->bytes, msg->rcount);
 	}
-
-	RB_DICTIONARY_FOREACH(amsg, &iter, alias_dict)
-	{
-		s_assert(amsg->name != NULL);
-		sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
-				   form_str(RPL_STATSCOMMANDS),
-				   amsg->name, amsg->hits, 0L, 0);
-	}
 }
 
 static void
 stats_dnsbl(struct Client *source_p)
 {
 	rb_dictionary_iter iter;
-	struct blacklist_stats *stats;
+	struct DNSBLEntryStats *stats;
+
+	if(dnsbl_stats == NULL)
+		return;
 
-	RB_DICTIONARY_FOREACH(stats, &iter, bl_stats)
+	RB_DICTIONARY_FOREACH(stats, &iter, dnsbl_stats)
 	{
 		/* use RPL_STATSDEBUG for now -- jilles */
 		sendto_one_numeric(source_p, RPL_STATSDEBUG, "n :%d %s",
@@ -774,7 +750,7 @@ stats_oper(struct Client *source_p)
 	struct oper_conf *oper_p;
 	rb_dlink_node *ptr;
 
-	if(!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only)
+	if(!IsOperGeneral(source_p) && ConfigFileEntry.stats_o_oper_only)
 	{
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
@@ -788,7 +764,7 @@ stats_oper(struct Client *source_p)
 		sendto_one_numeric(source_p, RPL_STATSOLINE,
 				form_str(RPL_STATSOLINE),
 				oper_p->username, oper_p->host, oper_p->name,
-				IsOper(source_p) ? oper_p->privset->name : "0", "-1");
+				HasPrivilege(source_p, "oper:privs") ? oper_p->privset->name : "0", "-1");
 	}
 }
 
@@ -829,7 +805,7 @@ stats_operedup (struct Client *source_p)
 	{
 		target_p = oper_ptr->data;
 
-		if(IsOperInvis(target_p) && !IsOper(source_p))
+		if(!SeesOper(target_p, source_p))
 			continue;
 
 		if(target_p->user->away)
@@ -852,7 +828,7 @@ stats_operedup (struct Client *source_p)
 static void
 stats_ports (struct Client *source_p)
 {
-	if(!IsOper (source_p) && ConfigFileEntry.stats_P_oper_only)
+	if(!IsOperGeneral (source_p) && ConfigFileEntry.stats_P_oper_only)
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 	else
@@ -910,6 +886,26 @@ stats_resv(struct Client *source_p)
 	}
 }
 
+static void
+stats_secure(struct Client *source_p)
+{
+	struct AddressRec *arec;
+	struct ConfItem *aconf;
+	size_t i;
+
+	for (i = 0; i < ATABLE_SIZE; i++)
+	{
+		for (arec = atable[i]; arec; arec = arec->next)
+		{
+			if(arec->type == CONF_SECURE)
+			{
+				aconf = arec->aconf;
+				sendto_one_numeric(source_p, RPL_STATSDEBUG, "s :%s", aconf->host);
+			}
+		}
+	}
+}
+
 static void
 stats_ssld_foreach(void *data, pid_t pid, int cli_count, enum ssld_status status, const char *version)
 {
@@ -1085,85 +1081,6 @@ stats_uptime (struct Client *source_p)
 			   Count.totalrestartcount);
 }
 
-struct shared_flags
-{
-	int flag;
-	char letter;
-};
-static struct shared_flags shared_flagtable[] =
-{
-	{ SHARED_PKLINE,	'K' },
-	{ SHARED_TKLINE,	'k' },
-	{ SHARED_UNKLINE,	'U' },
-	{ SHARED_PXLINE,	'X' },
-	{ SHARED_TXLINE,	'x' },
-	{ SHARED_UNXLINE,	'Y' },
-	{ SHARED_PRESV,		'Q' },
-	{ SHARED_TRESV,		'q' },
-	{ SHARED_UNRESV,	'R' },
-	{ SHARED_LOCOPS,	'L' },
-	{ SHARED_REHASH,	'H' },
-	{ SHARED_TDLINE,	'd' },
-	{ SHARED_PDLINE,	'D' },
-	{ SHARED_UNDLINE,	'E' },
-	{ SHARED_GRANT,		'G' },
-	{ SHARED_DIE,		'I' },
-	{ 0,			'\0'}
-};
-
-
-static void
-stats_shared (struct Client *source_p)
-{
-	struct remote_conf *shared_p;
-	rb_dlink_node *ptr;
-	char buf[sizeof(shared_flagtable)/sizeof(shared_flagtable[0])];
-	char *p;
-	int i;
-
-	RB_DLINK_FOREACH(ptr, shared_conf_list.head)
-	{
-		shared_p = ptr->data;
-
-		p = buf;
-
-		*p++ = 'c';
-
-		for(i = 0; shared_flagtable[i].flag != 0; i++)
-		{
-			if(shared_p->flags & shared_flagtable[i].flag)
-				*p++ = shared_flagtable[i].letter;
-		}
-
-		*p = '\0';
-
-		sendto_one_numeric(source_p, RPL_STATSULINE,
-					form_str(RPL_STATSULINE),
-					shared_p->server, shared_p->username,
-					shared_p->host, buf);
-	}
-
-	RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
-	{
-		shared_p = ptr->data;
-
-		p = buf;
-
-		*p++ = 'C';
-
-		for(i = 0; shared_flagtable[i].flag != 0; i++)
-		{
-			if(shared_p->flags & shared_flagtable[i].flag)
-				*p++ = shared_flagtable[i].letter;
-		}
-
-		*p = '\0';
-
-		sendto_one_numeric(source_p, RPL_STATSULINE,
-					form_str(RPL_STATSULINE),
-					shared_p->server, "*", "*", buf);
-	}
-}
 
 /* stats_servers()
  *
@@ -1180,7 +1097,7 @@ stats_servers (struct Client *source_p)
 	int days, hours, minutes;
 	int j = 0;
 
-	if(ConfigServerHide.flatten_links && !IsOper(source_p) &&
+	if(ConfigServerHide.flatten_links && !IsOperGeneral(source_p) &&
 	   !IsExemptShide(source_p))
 	{
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
@@ -1256,7 +1173,7 @@ stats_gecos(struct Client *source_p)
 static void
 stats_class(struct Client *source_p)
 {
-	if(ConfigFileEntry.stats_y_oper_only && !IsOper(source_p))
+	if(ConfigFileEntry.stats_y_oper_only && !IsOperGeneral(source_p))
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 	else
@@ -1523,7 +1440,7 @@ stats_servlinks (struct Client *source_p)
 	int j = 0;
 	char buf[128];
 
-	if(ConfigServerHide.flatten_links && !IsOper (source_p) &&
+	if(ConfigServerHide.flatten_links && !IsOperGeneral (source_p) &&
 	   !IsExemptShide(source_p))
 	{
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
@@ -1552,7 +1469,7 @@ stats_servlinks (struct Client *source_p)
 			rb_current_time() - target_p->localClient->firsttime,
 			(rb_current_time() > target_p->localClient->lasttime) ?
 			 (rb_current_time() - target_p->localClient->lasttime) : 0,
-			IsOper (source_p) ? show_capabilities (target_p) : "TS");
+			IsOperGeneral (source_p) ? show_capabilities (target_p) : "TS");
 	}
 
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
@@ -1581,9 +1498,9 @@ stats_servlinks (struct Client *source_p)
 }
 
 static inline bool
-stats_l_should_show_oper(struct Client *target_p)
+stats_l_should_show_oper(struct Client *source_p, struct Client *target_p)
 {
-	return (!IsOperInvis(target_p));
+	return SeesOper(target_p, source_p);
 }
 
 static void
@@ -1594,12 +1511,17 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 	const char *name;
 	char statchar = parv[1][0];
 
+	if (ConfigFileEntry.stats_l_oper_only == STATS_L_OPER_ONLY_YES && !IsOperGeneral(source_p))
+	{
+		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+		return;
+	}
+
 	/* this is def targeted at us somehow.. */
-	if(parc > 2 && !EmptyString(parv[2]))
+	if (parc > 2 && !EmptyString(parv[2]))
 	{
 		/* directed at us generically? */
-		if(match(parv[2], me.name) ||
-		   (!MyClient(source_p) && !irccmp(parv[2], me.id)))
+		if (match(parv[2], me.name) || (!MyClient(source_p) && !irccmp(parv[2], me.id)))
 		{
 			name = me.name;
 			doall = true;
@@ -1611,24 +1533,31 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 		}
 
 		/* must be directed at a specific person thats not us */
-		if(!doall && !wilds)
+		if (!doall && !wilds)
 		{
 			struct Client *target_p;
 
-			if(MyClient(source_p))
+			if (MyClient(source_p))
 				target_p = find_named_person(name);
 			else
 				target_p = find_person(name);
 
-			if(target_p != NULL)
+			if (target_p != source_p && ConfigFileEntry.stats_l_oper_only != STATS_L_OPER_ONLY_NO
+					&& !IsOperGeneral(source_p))
+			{
+				sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+			}
+			else if (target_p != NULL)
 			{
 				stats_spy(source_p, statchar, target_p->name);
 				stats_l_client(source_p, target_p, statchar);
 			}
 			else
+			{
 				sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
 						form_str(ERR_NOSUCHSERVER),
 						name);
+			}
 
 			return;
 		}
@@ -1641,7 +1570,16 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 
 	stats_spy(source_p, statchar, name);
 
-	if(doall)
+	if (ConfigFileEntry.stats_l_oper_only != STATS_L_OPER_ONLY_NO && !IsOperGeneral(source_p))
+	{
+		if (doall && MyClient(source_p))
+			stats_l_client(source_p, source_p, statchar);
+		else
+			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+		return;
+	}
+
+	if (doall)
 	{
 		/* local opers get everyone */
 		if(MyOper(source_p))
@@ -1658,7 +1596,7 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 			stats_l_list(source_p, name, doall, wilds, &local_oper_list, statchar, stats_l_should_show_oper);
 		}
 
-		if (!ConfigServerHide.flatten_links || IsOper(source_p) ||
+		if (!ConfigServerHide.flatten_links || IsOperGeneral(source_p) ||
 				IsExemptShide(source_p))
 			stats_l_list(source_p, name, doall, wilds, &serv_list, statchar, NULL);
 
@@ -1675,7 +1613,7 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 
 static void
 stats_l_list(struct Client *source_p, const char *name, bool doall, bool wilds,
-	     rb_dlink_list * list, char statchar, bool (*check_fn)(struct Client *target_p))
+	     rb_dlink_list * list, char statchar, bool (*check_fn)(struct Client *source_p, struct Client *target_p))
 {
 	rb_dlink_node *ptr;
 	struct Client *target_p;
@@ -1691,7 +1629,7 @@ stats_l_list(struct Client *source_p, const char *name, bool doall, bool wilds,
 		if(!doall && wilds && !match(name, target_p->name))
 			continue;
 
-		if (check_fn == NULL || check_fn(target_p))
+		if (check_fn == NULL || check_fn(source_p, target_p))
 			stats_l_client(source_p, target_p, statchar);
 	}
 }
@@ -1712,7 +1650,7 @@ stats_l_client(struct Client *source_p, struct Client *target_p,
 				rb_current_time() - target_p->localClient->firsttime,
 				(rb_current_time() > target_p->localClient->lasttime) ?
 				 (rb_current_time() - target_p->localClient->lasttime) : 0,
-				IsOper(source_p) ? show_capabilities(target_p) : "-");
+				IsOperGeneral(source_p) ? show_capabilities(target_p) : "-");
 	}
 
 	else