vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ircd: add general::hide_opers_in_whois to simulate ircd-seven operhide

Browse source
This commit is contained in:
William Pitcock 2016-01-15 13:38:40 -06:00
parent 161ac1c8d5
commit 71c955336e
6 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/ircd.conf.example
View file

@ -546,6 +546,7 @@ general {
max_ratelimit_tokens = 30; max_ratelimit_tokens = 30;
away_interval = 30; away_interval = 30;
certfp_method = sha1; certfp_method = sha1;
hide_opers_in_whois = no;
}; };
modules { modules {

3
doc/reference.conf
View file

@ -1337,6 +1337,9 @@ general {
* prior to charybdis 3.5 MUST use sha1 for certfp_method. * prior to charybdis 3.5 MUST use sha1 for certfp_method.
*/ */
certfp_method = sha1; certfp_method = sha1;
/* hide_opers_in_whois: if set to YES, then oper status will be hidden in /WHOIS output. */
hide_opers_in_whois = no;
}; };
modules { modules {

2
include/s_conf.h
View file

@ -237,6 +237,8 @@ struct config_file_entry
unsigned int nicklen; unsigned int nicklen;
int certfp_method; int certfp_method;
int hide_opers_in_whois;
}; };
struct config_channel_entry struct config_channel_entry

1
ircd/newconf.c
View file

@ -2428,6 +2428,7 @@ static struct ConfEntry conf_general_table[] =
{ "client_flood_message_time", CF_INT, NULL, 0, &ConfigFileEntry.client_flood_message_time }, { "client_flood_message_time", CF_INT, NULL, 0, &ConfigFileEntry.client_flood_message_time },
{ "max_ratelimit_tokens", CF_INT, NULL, 0, &ConfigFileEntry.max_ratelimit_tokens }, { "max_ratelimit_tokens", CF_INT, NULL, 0, &ConfigFileEntry.max_ratelimit_tokens },
{ "away_interval", CF_INT, NULL, 0, &ConfigFileEntry.away_interval }, { "away_interval", CF_INT, NULL, 0, &ConfigFileEntry.away_interval },
{ "hide_opers_in_whois", CF_YESNO, NULL, 0, &ConfigFileEntry.hide_opers_in_whois },
{ "certfp_method", CF_STRING, conf_set_general_certfp_method, 0, NULL }, { "certfp_method", CF_STRING, conf_set_general_certfp_method, 0, NULL },
{ "\0", 0, NULL, 0, NULL } { "\0", 0, NULL, 0, NULL }
}; };

1
ircd/s_conf.c
View file

@ -825,6 +825,7 @@ set_default_conf(void)
ConfigFileEntry.nicklen = NICKLEN; ConfigFileEntry.nicklen = NICKLEN;
ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA1; ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA1;
ConfigFileEntry.hide_opers_in_whois = 0;
if (!alias_dict) if (!alias_dict)
alias_dict = irc_dictionary_create("alias", strcasecmp); alias_dict = irc_dictionary_create("alias", strcasecmp);

2
modules/m_whois.c
View file

@ -317,7 +317,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY), sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
target_p->name, target_p->user->away); target_p->name, target_p->user->away);
if(IsOper(target_p)) if(IsOper(target_p) && (!ConfigFileEntry.hide_opers_in_whois || source_p == target_p))
{ {
sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR), sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
target_p->name, target_p->name,