Merge remote-tracking branch 'ophion/upstream/dnsbl-rename'

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index b5cc9c6121274399f4a403e550d97abe76d75bf4..4ffd23b6f77efdf1ce3b548b05f6e3b1414dab89 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -26,7 +26,6 @@
 #include "m_info.h"
 #include "channel.h"
 #include "client.h"
-#include "common.h"
 #include "match.h"
 #include "ircd.h"
 #include "hook.h"
@@ -152,6 +151,12 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.client_flood_message_time,
                "Time to allow per client_flood_message_num outside of burst",
        },
+       {
+               "post_registration_delay",
+               OUTPUT_DECIMAL,
+               &ConfigFileEntry.post_registration_delay,
+               "Time to wait before processing commands from a new client",
+       },
        {
                "connect_timeout",
                OUTPUT_DECIMAL,
@@ -285,18 +290,6 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.hide_spoof_ips,
                "Hide IPs of spoofed users"
        },
-       {
-               "hub",
-               OUTPUT_BOOLEAN_YN,
-               &ServerInfo.hub,
-               "Server is a hub"
-       },
-       {
-               "kline_delay",
-               OUTPUT_DECIMAL,
-               &ConfigFileEntry.kline_delay,
-               "Duration of time to delay kline checking"
-       },
        {
                "kline_reason",
                OUTPUT_STRING,
@@ -531,6 +524,12 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.away_interval,
                "The minimum time between aways",
        },
+       {
+               "tls_ciphers_oper_only",
+               OUTPUT_BOOLEAN_YN,
+               &ConfigFileEntry.tls_ciphers_oper_only,
+               "TLS cipher strings are hidden in whois for non-opers",
+       },
        {
                "default_split_server_count",
                OUTPUT_DECIMAL,
@@ -639,6 +638,12 @@ static struct InfoStruct info_table[] = {
                &ConfigChannel.resv_forcepart,
                "Force-part local users on channel RESV"
        },
+       {
+               "opmod_send_statusmsg",
+               OUTPUT_BOOLEAN_YN,
+               &ConfigChannel.opmod_send_statusmsg,
+               "Send messages to @#channel if affected by +z"
+       },
        {
                "disable_hidden",
                OUTPUT_BOOLEAN_YN,
@@ -779,7 +784,7 @@ send_conf_options(struct Client *source_p)
 
        /*
         * Now send them a list of all our configuration options
-        * (mostly from config.h)
+        * (mostly from defaults.h)
         */
        for (infoptr = MyInformation; infoptr->name; infoptr++)
        {