Remove stray SetCork.

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index 6468f829a8fd3905647446beec11609e4dc2342f..3916eaeb9ab507c1409247a55888945315e50e5c 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "m_info.h"
 #include "channel.h"
 #include "client.h"
@@ -93,10 +92,10 @@ static struct InfoStruct info_table[] = {
                "Farconnect notices available or operspy accountability limited"
        },
        {
-               "max_clients",
+               "max_connections",
                OUTPUT_DECIMAL,
-               &ServerInfo.max_clients,
-               "Maximum clients allowed (configured)",
+               &maxconnections,
+               "Max number connections"
        },
        {
                "anti_nick_flood",
@@ -170,12 +169,6 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.disable_fake_channels,
                "Controls whether bold etc are disabled for JOIN"
        },
-       {
-               "dot_in_ip6_addr",
-               OUTPUT_BOOLEAN,
-               &ConfigFileEntry.dot_in_ip6_addr,
-               "Suffix a . to ip6 addresses",
-       },
        {
                "dots_in_ident",
                OUTPUT_DECIMAL,
@@ -225,12 +218,6 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.fname_klinelog,
                "KLINE etc log file"
        },
-       {
-               "fname_glinelog",
-               OUTPUT_STRING,
-               &ConfigFileEntry.fname_glinelog,
-               "GLINE log file"
-       },
        {
                "fname_operspylog",
                OUTPUT_STRING,
@@ -243,30 +230,6 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.fname_ioerrorlog,
                "IO error log file"
        },
-       {
-               "glines",
-               OUTPUT_BOOLEAN,
-               &ConfigFileEntry.glines,
-               "G-line (network-wide K-line) support"
-       },
-       {
-               "gline_time",
-               OUTPUT_DECIMAL,
-               &ConfigFileEntry.gline_time,
-               "Expiry time for G-lines"
-       },
-       {
-               "gline_min_cidr",
-               OUTPUT_DECIMAL,
-               &ConfigFileEntry.gline_min_cidr,
-               "Minimum CIDR bitlen for ipv4 glines"
-       },
-       {
-               "gline_min_cidr6",
-               OUTPUT_DECIMAL,
-               &ConfigFileEntry.gline_min_cidr6,
-               "Minimum CIDR bitlen for ipv6 glines"
-       },
        {
                "global_snotices",
                OUTPUT_BOOLEAN_YN,
@@ -291,12 +254,6 @@ static struct InfoStruct info_table[] = {
                &ServerInfo.hub,
                "Server is a hub"
        },
-       {
-               "idletime",
-               OUTPUT_DECIMAL,
-               &ConfigFileEntry.idletime,
-               "Number of minutes before a client is considered idle"
-       },
        {
                "kline_delay",
                OUTPUT_DECIMAL,
@@ -349,7 +306,7 @@ static struct InfoStruct info_table[] = {
                "min_nonwildcard",
                OUTPUT_DECIMAL,
                &ConfigFileEntry.min_nonwildcard,
-               "Minimum non-wildcard chars in K/G lines",
+               "Minimum non-wildcard chars in K lines",
        },
        {
                "min_nonwildcard_simple",
@@ -636,7 +593,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
 {
        static time_t last_used = 0L;
 
-       if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+       if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
        {
                /* safe enough to give this on a local connect only */
                sendto_one(source_p, form_str(RPL_LOAD2HI),
@@ -645,7 +602,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
                return 0;
        }
        else
-               last_used = CurrentTime;
+               last_used = rb_current_time();
 
        if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) != HUNTED_ISME)
                return 0;
@@ -670,7 +627,6 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *
        if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME)
        {
                info_spy(source_p);
-
                send_info_text(source_p);
 
                if(IsOper(source_p))