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 d3ddb3b88bf5df161fab268f8882cb7633a24fd6..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,
@@ -575,7 +587,7 @@ static struct InfoStruct info_table[] = {
        {
                "resv_forcepart",
                OUTPUT_BOOLEAN_YN,
-               { &ConfigChannel.resv_forcepart },
+               &ConfigChannel.resv_forcepart,
                "Force-part local users on channel RESV"
        },
        {