librb mbedTLS: der_pubkey is used out of scope

[solanum.git] / ircd / newconf.c

diff --git a/ircd/newconf.c b/ircd/newconf.c
index ee54fc786ab3c7ad85c15a1a580c1ea5dc076711..22cc983beddbb88b948b1cca1dacd00b8086eea4 100644 (file)
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -1349,38 +1349,6 @@ conf_set_connect_flags(void *data)
        set_modes_from_table(&yy_server->flags, "flag", connect_table, args);
 }
 
-static void
-conf_set_connect_hub_mask(void *data)
-{
-       struct remote_conf *yy_hub;
-
-       if(EmptyString(yy_server->name))
-               return;
-
-       yy_hub = make_remote_conf();
-       yy_hub->flags = CONF_HUB;
-
-       yy_hub->host = rb_strdup(data);
-       yy_hub->server = rb_strdup(yy_server->name);
-       rb_dlinkAdd(yy_hub, &yy_hub->node, &hubleaf_conf_list);
-}
-
-static void
-conf_set_connect_leaf_mask(void *data)
-{
-       struct remote_conf *yy_leaf;
-
-       if(EmptyString(yy_server->name))
-               return;
-
-       yy_leaf = make_remote_conf();
-       yy_leaf->flags = CONF_LEAF;
-
-       yy_leaf->host = rb_strdup(data);
-       yy_leaf->server = rb_strdup(yy_server->name);
-       rb_dlinkAdd(yy_leaf, &yy_leaf->node, &hubleaf_conf_list);
-}
-
 static void
 conf_set_connect_class(void *data)
 {
@@ -1542,6 +1510,21 @@ conf_set_general_stats_i_oper_only(void *data)
                conf_report_error("Invalid setting '%s' for general::stats_i_oper_only.", val);
 }
 
+static void
+conf_set_general_stats_l_oper_only(void *data)
+{
+       char *val = data;
+
+       if(rb_strcasecmp(val, "yes") == 0)
+               ConfigFileEntry.stats_l_oper_only = STATS_L_OPER_ONLY_YES;
+       else if(rb_strcasecmp(val, "self") == 0)
+               ConfigFileEntry.stats_l_oper_only = STATS_L_OPER_ONLY_SELF;
+       else if(rb_strcasecmp(val, "no") == 0)
+               ConfigFileEntry.stats_l_oper_only = STATS_L_OPER_ONLY_NO;
+       else
+               conf_report_error("Invalid setting '%s' for general::stats_l_oper_only.", val);
+}
+
 static void
 conf_set_general_compression_level(void *data)
 {
@@ -2637,8 +2620,6 @@ static struct ConfEntry conf_connect_table[] =
        { "vhost",      CF_QSTRING, conf_set_connect_vhost,     0, NULL },
        { "port",       CF_INT,     conf_set_connect_port,      0, NULL },
        { "aftype",     CF_STRING,  conf_set_connect_aftype,    0, NULL },
-       { "hub_mask",   CF_QSTRING, conf_set_connect_hub_mask,  0, NULL },
-       { "leaf_mask",  CF_QSTRING, conf_set_connect_leaf_mask, 0, NULL },
        { "class",      CF_QSTRING, conf_set_connect_class,     0, NULL },
        { "\0", 0, NULL, 0, NULL }
 };
@@ -2651,8 +2632,9 @@ static struct ConfEntry conf_general_table[] =
        { "compression_level",  CF_INT,    conf_set_general_compression_level,  0, NULL },
        { "havent_read_conf",   CF_YESNO,  conf_set_general_havent_read_conf,   0, NULL },
        { "hide_error_messages",CF_STRING, conf_set_general_hide_error_messages,0, NULL },
-       { "stats_k_oper_only",  CF_STRING, conf_set_general_stats_k_oper_only,  0, NULL },
        { "stats_i_oper_only",  CF_STRING, conf_set_general_stats_i_oper_only,  0, NULL },
+       { "stats_k_oper_only",  CF_STRING, conf_set_general_stats_k_oper_only,  0, NULL },
+       { "stats_l_oper_only",  CF_STRING, conf_set_general_stats_l_oper_only,  0, NULL },
        { "default_umodes",     CF_QSTRING, conf_set_general_default_umodes, 0, NULL },
 
        { "default_operstring", CF_QSTRING, NULL, REALLEN,    &ConfigFileEntry.default_operstring },
@@ -2711,7 +2693,6 @@ static struct ConfEntry conf_general_table[] =
        { "short_motd",         CF_YESNO, NULL, 0, &ConfigFileEntry.short_motd          },
        { "stats_c_oper_only",  CF_YESNO, NULL, 0, &ConfigFileEntry.stats_c_oper_only   },
        { "stats_e_disabled",   CF_YESNO, NULL, 0, &ConfigFileEntry.stats_e_disabled    },
-       { "stats_h_oper_only",  CF_YESNO, NULL, 0, &ConfigFileEntry.stats_h_oper_only   },
        { "stats_o_oper_only",  CF_YESNO, NULL, 0, &ConfigFileEntry.stats_o_oper_only   },
        { "stats_P_oper_only",  CF_YESNO, NULL, 0, &ConfigFileEntry.stats_P_oper_only   },
        { "stats_y_oper_only",  CF_YESNO, NULL, 0, &ConfigFileEntry.stats_y_oper_only   },
@@ -2733,6 +2714,7 @@ static struct ConfEntry conf_general_table[] =
        { "certfp_method",      CF_STRING, conf_set_general_certfp_method, 0, NULL },
        { "drain_reason",       CF_QSTRING, NULL, BUFSIZE, &ConfigFileEntry.drain_reason        },
        { "tls_ciphers_oper_only",      CF_YESNO, NULL, 0, &ConfigFileEntry.tls_ciphers_oper_only       },
+       { "oper_secure_only",   CF_YESNO, NULL, 0, &ConfigFileEntry.oper_secure_only    },
        { "\0",                 0,        NULL, 0, NULL }
 };
 
@@ -2762,6 +2744,7 @@ static struct ConfEntry conf_channel_table[] =
        { "displayed_usercount",        CF_INT, NULL, 0, &ConfigChannel.displayed_usercount     },
        { "strip_topic_colors", CF_YESNO, NULL, 0, &ConfigChannel.strip_topic_colors    },
        { "opmod_send_statusmsg", CF_YESNO, NULL, 0, &ConfigChannel.opmod_send_statusmsg        },
+       { "ip_bans_through_vhost", CF_YESNO, NULL, 0, &ConfigChannel.ip_bans_through_vhost      },
        { "\0",                 0,        NULL, 0, NULL }
 };