autochanmodes support

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

diff --git a/src/newconf.c b/src/newconf.c
index 782ed1aaebbf5d3285041cc3a6c5a38d517c0680..2f333fe370307e46e75398f89ff273a7d8979594 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -286,12 +286,6 @@ conf_set_modules_path(void *data)
 #endif
 }
 
-struct mode_table
-{
-       const char *name;
-       int mode;
-};
-
 /* *INDENT-OFF* */
 static struct mode_table umode_table[] = {
        {"callerid",    UMODE_CALLERID  },
@@ -303,6 +297,10 @@ static struct mode_table umode_table[] = {
        {"servnotice",  UMODE_SERVNOTICE},
        {"wallop",      UMODE_WALLOP    },
        {"operwall",    UMODE_OPERWALL  },
+       {"override",    UMODE_OVERRIDE  },
+       {"noctcp",      UMODE_NOCTCP    },
+       {"noinvite",    UMODE_NOINVITE  },
+       {"bot",         UMODE_BOT       },
        {NULL, 0}
 };
 
@@ -1014,6 +1012,24 @@ conf_set_auth_passwd(void *data)
        yy_aconf->passwd = rb_strdup(data);
 }
 
+static void
+conf_set_auth_autojoin(void *data)
+{
+       if(yy_aconf->autojoin)
+               memset(yy_aconf->autojoin, 0, strlen(yy_aconf->autojoin));
+       rb_free(yy_aconf->autojoin);
+       yy_aconf->autojoin = rb_strdup(data);
+}
+
+static void
+conf_set_auth_autojoin_opers(void *data)
+{
+       if(yy_aconf->autojoin_opers)
+               memset(yy_aconf->autojoin_opers, 0, strlen(yy_aconf->autojoin));
+       rb_free(yy_aconf->autojoin_opers);
+       yy_aconf->autojoin_opers = rb_strdup(data);
+}
+
 static void
 conf_set_auth_spoof(void *data)
 {
@@ -2080,6 +2096,8 @@ static struct ConfEntry conf_auth_table[] =
        { "password",   CF_QSTRING, conf_set_auth_passwd,       0, NULL },
        { "class",      CF_QSTRING, conf_set_auth_class,        0, NULL },
        { "spoof",      CF_QSTRING, conf_set_auth_spoof,        0, NULL },
+       { "autojoin",  CF_QSTRING, conf_set_auth_autojoin,              0, NULL },
+       { "autojoin_opers",     CF_QSTRING, conf_set_auth_autojoin_opers,       0, NULL },
        { "redirserv",  CF_QSTRING, conf_set_auth_redir_serv,   0, NULL },
        { "redirport",  CF_INT,     conf_set_auth_redir_port,   0, NULL },
        { "flags",      CF_STRING | CF_FLIST, conf_set_auth_flags,      0, NULL },
@@ -2154,6 +2172,7 @@ static struct ConfEntry conf_general_table[] =
        { "no_oper_flood",      CF_YESNO, NULL, 0, &ConfigFileEntry.no_oper_flood       },
        { "operspy_admin_only", CF_YESNO, NULL, 0, &ConfigFileEntry.operspy_admin_only  },
        { "operspy_dont_care_user_info", CF_YESNO, NULL, 0, &ConfigFileEntry.operspy_dont_care_user_info },
+       { "secret_channels_in_whois", CF_YESNO, NULL, 0, &ConfigFileEntry.secret_channels_in_whois },
        { "pace_wait",          CF_TIME,  NULL, 0, &ConfigFileEntry.pace_wait           },
        { "pace_wait_simple",   CF_TIME,  NULL, 0, &ConfigFileEntry.pace_wait_simple    },
        { "ping_cookie",        CF_YESNO, NULL, 0, &ConfigFileEntry.ping_cookie         },
@@ -2175,11 +2194,13 @@ static struct ConfEntry conf_general_table[] =
        { "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       },
+       { "expire_override_time", CF_TIME, NULL, 0, &ConfigFileEntry.expire_override_time       },
        { "\0",                 0,        NULL, 0, NULL }
 };
 
 static struct ConfEntry conf_channel_table[] =
 {
+       { "autochanmodes",      CF_QSTRING, NULL, 0, &ConfigChannel.autochanmodes       },
        { "default_split_user_count",   CF_INT,  NULL, 0, &ConfigChannel.default_split_user_count        },
        { "default_split_server_count", CF_INT,  NULL, 0, &ConfigChannel.default_split_server_count },
        { "burst_topicwho",     CF_YESNO, NULL, 0, &ConfigChannel.burst_topicwho        },
@@ -2192,6 +2213,8 @@ static struct ConfEntry conf_channel_table[] =
        { "no_create_on_split", CF_YESNO, NULL, 0, &ConfigChannel.no_create_on_split    },
        { "no_join_on_split",   CF_YESNO, NULL, 0, &ConfigChannel.no_join_on_split      },
        { "only_ascii_channels", CF_YESNO, NULL, 0, &ConfigChannel.only_ascii_channels },
+       { "cycle_host_change",  CF_YESNO, NULL, 0, &ConfigChannel.cycle_host_change },
+       { "host_in_topic",      CF_YESNO, NULL, 0, &ConfigChannel.host_in_topic },
        { "use_except",         CF_YESNO, NULL, 0, &ConfigChannel.use_except            },
        { "use_invex",          CF_YESNO, NULL, 0, &ConfigChannel.use_invex             },
        { "use_knock",          CF_YESNO, NULL, 0, &ConfigChannel.use_knock             },