Mint CLICAP_FLAGS_PRIORITY

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index 66095d21fb0e56d1421a99b37b13e843e5ca8f28..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,14 +37,18 @@
 #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";
 
 static void send_conf_options(struct Client *source_p);
 static void send_birthdate_online_time(struct Client *source_p);
 static void send_info_text(struct Client *source_p);
 static void info_spy(struct Client *);
 
-static int m_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int mo_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message info_msgtab = {
        "INFO", 0, 0, 0, 0,
@@ -60,7 +63,7 @@ mapi_hlist_av1 info_hlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(info, NULL, NULL, info_clist, info_hlist, NULL, "$Revision: 3396 $");
+DECLARE_MODULE_AV2(info, NULL, NULL, info_clist, info_hlist, NULL, NULL, NULL, info_desc);
 
 /*
  * jdc -- Structure for our configuration value table
@@ -149,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,
@@ -201,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",
@@ -282,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,
@@ -322,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",
@@ -528,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,
@@ -636,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,
@@ -669,7 +678,7 @@ static struct InfoStruct info_table[] = {
  ** m_info
  **  parv[1] = servername
  */
-static int
+static void
 m_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        static time_t last_used = 0L;
@@ -680,13 +689,13 @@ m_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
                sendto_one(source_p, form_str(RPL_LOAD2HI),
                                me.name, source_p->name, "INFO");
                sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
-               return 0;
+               return;
        }
        else
                last_used = rb_current_time();
 
        if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) != HUNTED_ISME)
-               return 0;
+               return;
 
        info_spy(source_p);
 
@@ -694,14 +703,13 @@ m_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
        send_birthdate_online_time(source_p);
 
        sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
-       return 0;
 }
 
 /*
  ** mo_info
  **  parv[1] = servername
  */
-static int
+static void
 mo_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME)
@@ -709,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",
@@ -720,8 +728,6 @@ mo_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
                sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
        }
-
-       return 0;
 }
 
 /*
@@ -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++)
        {