Mint CLICAP_FLAGS_PRIORITY

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index b5cc9c6121274399f4a403e550d97abe76d75bf4..5046a7fff2484b9900e0ebf17c0a85ecf6873e62 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"
@@ -38,6 +37,7 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "s_newconf.h"
 
 static const char info_desc[] =
        "Provides the INFO command for retrieving server copyright, credits, and other info";
@@ -152,6 +152,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,
@@ -204,7 +210,7 @@ static struct InfoStruct info_table[] = {
                "dots_in_ident",
                OUTPUT_DECIMAL,
                &ConfigFileEntry.dots_in_ident,
-               "Number of permissable dots in an ident"
+               "Number of permissible dots in an ident"
        },
        {
                "failed_oper_notice",
@@ -285,18 +291,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,
@@ -325,7 +319,7 @@ static struct InfoStruct info_table[] = {
                "max_nick_changes",
                OUTPUT_DECIMAL,
                &ConfigFileEntry.max_nick_changes,
-               "NICK change threshhold setting"
+               "NICK change threshold setting"
        },
        {
                "max_nick_time",
@@ -531,6 +525,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 +639,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,
@@ -711,7 +717,7 @@ mo_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                info_spy(source_p);
                send_info_text(source_p);
 
-               if(IsOper(source_p))
+               if(IsOperGeneral(source_p))
                {
                        send_conf_options(source_p);
                        sendto_one_numeric(source_p, RPL_INFO, ":%s",
@@ -779,7 +785,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++)
        {