Cleanups to 005 code, from ratbox (androsyn).

[irc/rqf/shadowircd.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index e6a549a3e616e086506955148d11a91cbfdd351a..ceff047acef45b3fecc5924575f2fa7339edb6b5 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -307,7 +307,7 @@ static struct mode_table umode_table[] = {
        {NULL, 0}
 };
 
-static struct mode_table flag_table[] = {
+static struct mode_table oper_table[] = {
        {"encrypted",           OPER_ENCRYPTED          },
        {"local_kill",          OPER_LOCKILL            },
        {"global_kill",         OPER_GLOBKILL|OPER_LOCKILL      },
@@ -326,6 +326,7 @@ static struct mode_table flag_table[] = {
        {"oper_spy",            OPER_SPY                },
        {"hidden_oper",         OPER_INVIS              },
        {"remoteban",           OPER_REMOTEBAN          },
+       {"mass_notice",         OPER_MASSNOTICE         },
        {NULL, 0}
 };
 
@@ -466,7 +467,7 @@ conf_begin_oper(struct TopConf *tc)
        }
 
        yy_oper = make_oper_conf();
-       yy_oper->flags |= OPER_ENCRYPTED|OPER_RESV|OPER_OPERWALL|OPER_REMOTEBAN;
+       yy_oper->flags |= OPER_ENCRYPTED|OPER_RESV|OPER_OPERWALL|OPER_REMOTEBAN|OPER_MASSNOTICE;
 
        return 0;
 }
@@ -565,7 +566,7 @@ conf_set_oper_flags(void *data)
 {
        conf_parm_t *args = data;
 
-       set_modes_from_table(&yy_oper->flags, "flag", flag_table, args);
+       set_modes_from_table(&yy_oper->flags, "flag", oper_table, args);
 }
 
 static void
@@ -1107,6 +1108,7 @@ conf_begin_connect(struct TopConf *tc)
 
        yy_server = make_server_conf();
        yy_server->port = PORTNUM;
+       yy_server->flags |= SERVER_TB;
 
        if(conf_cur_block_name != NULL)
                DupString(yy_server->name, conf_cur_block_name);
@@ -2011,7 +2013,6 @@ static struct ConfEntry conf_general_table[] =
        { "connect_timeout",    CF_TIME,  NULL, 0, &ConfigFileEntry.connect_timeout     },
        { "default_floodcount", CF_INT,   NULL, 0, &ConfigFileEntry.default_floodcount  },
        { "disable_auth",       CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth        },
-       { "dot_in_ip6_addr",    CF_YESNO, NULL, 0, &ConfigFileEntry.dot_in_ip6_addr     },
        { "dots_in_ident",      CF_INT,   NULL, 0, &ConfigFileEntry.dots_in_ident       },
        { "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice  },
        { "glines",             CF_YESNO, NULL, 0, &ConfigFileEntry.glines              },
@@ -2019,7 +2020,6 @@ static struct ConfEntry conf_general_table[] =
        { "gline_min_cidr6",    CF_INT,   NULL, 0, &ConfigFileEntry.gline_min_cidr6     },
        { "gline_time",         CF_TIME,  NULL, 0, &ConfigFileEntry.gline_time          },
        { "global_snotices",    CF_YESNO, NULL, 0, &ConfigFileEntry.global_snotices     },
-       { "idletime",           CF_TIME,  NULL, 0, &ConfigFileEntry.idletime            },
        { "hide_spoof_ips",     CF_YESNO, NULL, 0, &ConfigFileEntry.hide_spoof_ips      },
        { "dline_with_reason",  CF_YESNO, NULL, 0, &ConfigFileEntry.dline_with_reason   },
        { "kline_with_reason",  CF_YESNO, NULL, 0, &ConfigFileEntry.kline_with_reason   },