ssld: we only will continue supporting one fingerprint method at a time

[solanum.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index 6a7a256d98bc3ac4a0905e237f8967a498c9132b..53c3067b57e2770abaf393fc8b52783cba1d5788 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -277,7 +277,7 @@ conf_set_serverinfo_nicklen(void *data)
        else if (ConfigFileEntry.nicklen < 9 + 1)
        {
                conf_report_error("Warning -- serverinfo::nicklen is too low (%u) -- forcing 9",
-                                 ConfigFileEntry.nicklen);
+                                 ConfigFileEntry.nicklen - 1);
                ConfigFileEntry.nicklen = 9 + 1;
        }
 }
@@ -865,9 +865,9 @@ conf_set_listen_port_both(void *data, int ssl)
                }
                 if(listener_address == NULL)
                 {
-                       add_listener(args->v.number, listener_address, AF_INET, ssl, yy_defer_accept);
+                       add_listener(args->v.number, listener_address, AF_INET, ssl, ssl || yy_defer_accept);
 #ifdef RB_IPV6
-                       add_listener(args->v.number, listener_address, AF_INET6, ssl, yy_defer_accept);
+                       add_listener(args->v.number, listener_address, AF_INET6, ssl, ssl || yy_defer_accept);
 #endif
                 }
                else
@@ -880,7 +880,7 @@ conf_set_listen_port_both(void *data, int ssl)
 #endif
                                family = AF_INET;
 
-                       add_listener(args->v.number, listener_address, family, ssl, yy_defer_accept);
+                       add_listener(args->v.number, listener_address, family, ssl, ssl || yy_defer_accept);
 
                 }
 
@@ -1864,7 +1864,7 @@ conf_set_blacklist_matches(void *data)
                        /* Check for validity */
                        if (*p == '.')
                                type = BLACKLIST_FILTER_ALL;
-                       else if (!isalnum(*p))
+                       else if (!isalnum((unsigned char)*p))
                        {
                                conf_report_error("blacklist::matches has invalid IP match entry %s",
                                                str);
@@ -2185,7 +2185,6 @@ remove_conf_item(const char *topconf, const char *name)
 static struct ConfEntry conf_serverinfo_table[] =
 {
        { "description",        CF_QSTRING, NULL, 0, &ServerInfo.description    },
-       { "network_desc",       CF_QSTRING, NULL, 0, &ServerInfo.network_desc   },
        { "hub",                CF_YESNO,   NULL, 0, &ServerInfo.hub            },
 
        { "network_name",       CF_QSTRING, conf_set_serverinfo_network_name,   0, NULL },
@@ -2311,7 +2310,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 +2365,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       },