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

config: further EGD removal

Browse source
This commit is contained in:
William Pitcock 2015-03-01 01:06:58 -06:00
parent e861902fd9
commit bb2a50509a
4 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/reference.conf
View file

@ -1225,18 +1225,6 @@ general {
* provided they have umode +s set */
oper_snomask = "+s";
/* use egd: if your system does not have *random devices yet you
* want to use OpenSSL and encrypted links, enable this. Beware -
* EGD is *very* CPU intensive when gathering data for its pool
*/
#use_egd = yes;
/* egdpool path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7
* which automatically finds the path.
*/
#egdpool_path = "/var/run/egd-pool";
/* compression level: level of compression for compressed links between
* servers.
*

3
include/s_conf.h
View file

@ -141,8 +141,6 @@ struct config_file_entry
const char *dpath; /* DPATH if set from command line */
const char *configfile;
char *egdpool_path;
char *default_operstring;
char *default_adminstring;
char *servicestring;
@ -208,7 +206,6 @@ struct config_file_entry
int min_nonwildcard_simple;
int default_floodcount;
int default_ident_timeout;
int use_egd;
int ping_cookie;
int tkline_expire_notices;
int use_whois_actually;

2
src/newconf.c
View file

@ -2311,7 +2311,6 @@ static struct ConfEntry conf_general_table[] =
{ "default_operstring", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.default_operstring },
{ "default_adminstring",CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.default_adminstring },
{ "servicestring", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.servicestring },
{ "egdpool_path", CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.egdpool_path },
{ "kline_reason", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.kline_reason },
{ "identify_service", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.identifyservice },
{ "identify_command", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.identifycommand },
@ -2367,7 +2366,6 @@ static struct ConfEntry conf_general_table[] =
{ "stats_y_oper_only", CF_YESNO, NULL, 0, &ConfigFileEntry.stats_y_oper_only },
{ "target_change", CF_YESNO, NULL, 0, &ConfigFileEntry.target_change },
{ "ts_max_delta", CF_TIME, NULL, 0, &ConfigFileEntry.ts_max_delta },
{ "use_egd", CF_YESNO, NULL, 0, &ConfigFileEntry.use_egd },
{ "ts_warn_delta", CF_TIME, NULL, 0, &ConfigFileEntry.ts_warn_delta },
{ "use_whois_actually", CF_YESNO, NULL, 0, &ConfigFileEntry.use_whois_actually },
{ "warn_no_nline", CF_YESNO, NULL, 0, &ConfigFileEntry.warn_no_nline },

2
src/s_conf.c
View file

@ -737,12 +737,10 @@ set_default_conf(void)
ConfigFileEntry.fname_klinelog = NULL;
ConfigFileEntry.fname_operspylog = NULL;
ConfigFileEntry.fname_ioerrorlog = NULL;
ConfigFileEntry.use_egd = NO;
ConfigFileEntry.hide_spoof_ips = YES;
ConfigFileEntry.hide_error_messages = 1;
ConfigFileEntry.dots_in_ident = 0;
ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
ConfigFileEntry.egdpool_path = NULL;
ConfigFileEntry.use_whois_actually = YES;
ConfigFileEntry.burst_away = NO;
ConfigFileEntry.collision_fnc = YES;