branch merge

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

diff --git a/src/newconf.c b/src/newconf.c
index 05f32fad65464cd36b56aa124cb45396dfdec2af..4861bc28580496392ef7ab387fe07fbf9a2fb09f 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -286,6 +286,12 @@ 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  },
@@ -297,7 +303,6 @@ 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       },
@@ -2200,6 +2205,7 @@ static struct ConfEntry conf_general_table[] =
 
 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        },