Remove ^M on line endings.

[irc/rqf/shadowircd.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index aed3469ddc42a04a52a1a0541402f88acd9a966a..b8b0ee722cb60009667ef7e92d459f387cc0727a 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -91,11 +91,11 @@ static struct InfoStruct info_table[] = {
                &opers_see_all_users,
                "Farconnect notices available or operspy accountability limited"
        },
-       {\r
-               "max_connections",\r
-               OUTPUT_DECIMAL,\r
-               &maxconnections,\r
-               "Max number connections"\r
+       {
+               "max_connections",
+               OUTPUT_DECIMAL,
+               &maxconnections,
+               "Max number connections"
        },
        {
                "anti_nick_flood",
@@ -218,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,
@@ -236,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,
@@ -336,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",
@@ -639,6 +609,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
        info_spy(source_p);
 
+       SetCork(source_p);
        send_info_text(source_p);
        send_birthdate_online_time(source_p);
 
@@ -657,7 +628,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))