Move to ratbox3 reject and throttle code.

[solanum.git] / modules / core / m_error.c

diff --git a/modules/core/m_error.c b/modules/core/m_error.c
index 0310eca8e345c106f96c3f47180fab6b70567995..9659f11b26b61538b89ccf35b93a6daee2d6186c 100644 (file)
--- a/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@ -31,9 +31,8 @@
 #include "numeric.h"
 #include "send.h"
 #include "msg.h"
 #include "numeric.h"
 #include "send.h"
 #include "msg.h"

-#include "memory.h"

 #include "modules.h"
 #include "modules.h"

-#include "s_log.h"
+#include "logger.h"

 #include "s_conf.h"
 
 static int m_error(struct Client *, struct Client *, int, const char **);
 #include "s_conf.h"
 
 static int m_error(struct Client *, struct Client *, int, const char **);


@@ -107,11 +106,11 @@ m_error(struct Client *client_p, struct Client *source_p, int parc, const char *
                if (hideit < 2)
                        sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : (is_remote_connect(client_p) ? L_NETWIDE : L_ALL),
                                        "ERROR :from %s -- %s",
                if (hideit < 2)
                        sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : (is_remote_connect(client_p) ? L_NETWIDE : L_ALL),
                                        "ERROR :from %s -- %s",

-                                       get_server_name(client_p, HIDE_IP), para);
+                                       client_p->name, para);

                if (hideit > 0)
                        sendto_realops_snomask(SNO_GENERAL, (hideit == 1 ? L_OPER : L_ALL) | (is_remote_connect(client_p) ? L_NETWIDE : L_ALL),
                                        "ERROR :from %s -- <hidden>",
                if (hideit > 0)
                        sendto_realops_snomask(SNO_GENERAL, (hideit == 1 ? L_OPER : L_ALL) | (is_remote_connect(client_p) ? L_NETWIDE : L_ALL),
                                        "ERROR :from %s -- <hidden>",

-                                       get_server_name(client_p, HIDE_IP));
+                                       client_p->name);

        }
 
        exit_client(client_p, source_p, source_p, "ERROR");
        }
 
        exit_client(client_p, source_p, source_p, "ERROR");


@@ -138,12 +137,12 @@ ms_error(struct Client *client_p, struct Client *source_p, int parc, const char
        if(client_p == source_p)
        {
                sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s -- %s",
        if(client_p == source_p)
        {
                sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s -- %s",

-                                    get_server_name(client_p, HIDE_IP), para);
+                                    client_p->name, para);

        }
        else
        {
                sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s via %s -- %s",
        }
        else
        {
                sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s via %s -- %s",

-                                    source_p->name, get_server_name(client_p, HIDE_IP), para);
+                                    source_p->name, client_p->name, para);

        }
 
        return 0;
        }
 
        return 0;