Add to the descriptions of owner and halfop in refrence.conf.

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

diff --git a/src/newconf.c b/src/newconf.c
index 05f32fad65464cd36b56aa124cb45396dfdec2af..b84903355245563da45c7724c6a62e61fce616f3 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -286,9 +286,16 @@ 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  },
+       {"softcallerid", UMODE_SCALLERID        },
        {"deaf",        UMODE_DEAF      },
        {"invisible",   UMODE_INVISIBLE },
        {"locops",      UMODE_LOCOPS    },
@@ -297,10 +304,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       },
+       {"override",    UMODE_OVERRIDE  },
        {NULL, 0}
 };
 
@@ -2194,12 +2201,12 @@ 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        },
@@ -2214,11 +2221,14 @@ static struct ConfEntry conf_channel_table[] =
        { "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_halfop",         CF_YESNO, NULL, 0, &ConfigChannel.use_halfop            },
+       { "use_owner",          CF_YESNO, NULL, 0, &ConfigChannel.use_owner             },
        { "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             },
        { "use_forward",        CF_YESNO, NULL, 0, &ConfigChannel.use_forward           },
        { "resv_forcepart",     CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart        },
+       { "kick_no_rejoin_time", CF_INT,  NULL, 0, &ConfigChannel.kick_no_rejoin_time   },
        { "\0",                 0,        NULL, 0, NULL }
 };