Automated merge with ssh://hg.atheme.org//hg/charybdis

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index 03671b43fa6ce8cc4086a8fc63eb96890399d55e..50fbac81cb0638392d139fc115ed82d23e2d82fc 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -133,6 +133,12 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.connect_timeout,
                "Connect timeout for connections to servers"
        },
+       {
+               "default_ident_timeout",
+               OUTPUT_DECIMAL,
+               &ConfigFileEntry.default_ident_timeout,
+               "Amount of time the server waits for ident responses from clients",
+       },
        {
                "default_floodcount",
                OUTPUT_DECIMAL,
@@ -482,6 +488,12 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.warn_no_nline,
                "Display warning if connecting server lacks N-line"
        },
+       {
+               "use_propagated_bans",
+               OUTPUT_BOOLEAN,
+               &ConfigFileEntry.use_propagated_bans,
+               "KLINE sets fully propagated bans"
+       },
        {
                "default_split_server_count",
                OUTPUT_DECIMAL,
@@ -542,6 +554,12 @@ static struct InfoStruct info_table[] = {
                &ConfigChannel.no_join_on_split,
                "Disallow joining channels when split",
        },
+       {
+               "only_ascii_channels",
+               OUTPUT_BOOLEAN_YN,
+               &ConfigChannel.only_ascii_channels,
+               "Controls whether non-ASCII is disabled for JOIN"
+       },
        {
                "use_except",
                OUTPUT_BOOLEAN_YN,
@@ -566,6 +584,12 @@ static struct InfoStruct info_table[] = {
                &ConfigChannel.use_knock,
                "Enable /KNOCK",
        },
+       {
+               "resv_forcepart",
+               OUTPUT_BOOLEAN_YN,
+               &ConfigChannel.resv_forcepart,
+               "Force-part local users on channel RESV"
+       },
        {
                "disable_hidden",
                OUTPUT_BOOLEAN_YN,
@@ -597,7 +621,6 @@ static struct InfoStruct info_table[] = {
 
 /*
 ** m_info
-**  parv[0] = sender prefix
 **  parv[1] = servername
 */
 static int
@@ -630,7 +653,6 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 /*
 ** mo_info
-**  parv[0] = sender prefix
 **  parv[1] = servername
 */
 static int
@@ -642,7 +664,11 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *
                send_info_text(source_p);
 
                if(IsOper(source_p))
+               {
                        send_conf_options(source_p);
+                       sendto_one_numeric(source_p, RPL_INFO, ":%s",
+                                       rb_lib_version());
+               }
 
                send_birthdate_online_time(source_p);