config: further EGD removal

diff --git a/doc/reference.conf b/doc/reference.conf
index b49104ea38d7d181d6651544448e38d47171207c..62c68d64bf4a591231c4394164c833599ee5e042 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -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.  
         *

diff --git a/include/s_conf.h b/include/s_conf.h
index ceeae01a109bf74beac537ecf0b9c16a85c2e8f2..164e646f6d5f51da7b78e1ec208e42ad7f8985ef 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -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;

diff --git a/src/newconf.c b/src/newconf.c
index 6a7a256d98bc3ac4a0905e237f8967a498c9132b..cb96c3be19479d6b4ac25c4720d08cb83cb16692 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -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       },

diff --git a/src/s_conf.c b/src/s_conf.c
index a329c7b786d74f687012e457f10f9c662cdaa253..0f54d542dd4f3cdcce9ef5f719c924424fe6d0bf 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -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;