Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / core / m_error.c

diff --git a/modules/core/m_error.c b/modules/core/m_error.c
index 96d15dc0180e324bcb7ceb7af081c5d9b2d87d1a..df19a14b70bed5a75be9d98f47d8860bfe66d6b8 100644 (file)
--- a/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@ -32,7 +32,7 @@
 #include "send.h"
 #include "msg.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 **);
@@ -58,7 +58,7 @@ is_safe_error(const char *message)
 
        if (!strncmp(message, "Closing Link: 127.0.0.1 (", 25))
                return 1;
-       snprintf(prefix2, sizeof prefix2,
+       rb_snprintf(prefix2, sizeof prefix2,
                        "Closing Link: 127.0.0.1 %s (", me.name);
        if (!strncmp(message, prefix2, strlen(prefix2)))
                return 1;
@@ -85,7 +85,6 @@ is_safe_error(const char *message)
  * although this is called internally from other functions
  * --msa
  *
- *      parv[0] = sender prefix
  *      parv[*] = parameters
  */
 int
@@ -96,8 +95,11 @@ m_error(struct Client *client_p, struct Client *source_p, int parc, const char *
 
        para = (parc > 1 && *parv[1] != '\0') ? parv[1] : "<>";
 
-       ilog(L_SERVER, "Received ERROR message from %s: %s",
-            log_client_name(source_p, SHOW_IP), para);
+       if (IsAnyServer(client_p))
+       {
+               ilog(L_SERVER, "Received ERROR message from %s: %s",
+                    log_client_name(source_p, SHOW_IP), para);
+       }
 
        if(is_safe_error(para))
                hideit = 0;
@@ -106,11 +108,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",
-                                       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>",
-                                       get_server_name(client_p, HIDE_IP));
+                                       client_p->name);
        }
 
        exit_client(client_p, source_p, source_p, "ERROR");
@@ -137,12 +139,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",
-                                    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",
-                                    source_p->name, get_server_name(client_p, HIDE_IP), para);
+                                    source_p->name, client_p->name, para);
        }
 
        return 0;