X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/81af5bcb394280ff1af82486961d852b102b923b..8ee12f0c437eec8aa42af7b350c7e2a3ccafedbc:/modules/m_etrace.c

diff --git a/modules/m_etrace.c b/modules/m_etrace.c
index 219926e3..be65ab66 100644
--- a/modules/m_etrace.c
+++ b/modules/m_etrace.c
@@ -39,7 +39,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
@@ -52,7 +52,7 @@
 
 static int mo_etrace(struct Client *, struct Client *, int, const char **);
 static int me_etrace(struct Client *, struct Client *, int, const char **);
-static int mo_chantrace(struct Client *, struct Client *, int, const char **);
+static int m_chantrace(struct Client *, struct Client *, int, const char **);
 static int mo_masktrace(struct Client *, struct Client *, int, const char **);
 
 struct Message etrace_msgtab = {
@@ -61,7 +61,7 @@ struct Message etrace_msgtab = {
 };
 struct Message chantrace_msgtab = {
 	"CHANTRACE", 0, 0, 0, MFLG_SLOW,
-	{mg_ignore, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_chantrace, 2}}
+	{mg_ignore, {m_chantrace, 2}, mg_ignore, mg_ignore, mg_ignore, {m_chantrace, 2}}
 };
 struct Message masktrace_msgtab = {
 	"MASKTRACE", 0, 0, 0, MFLG_SLOW,
@@ -91,7 +91,7 @@ mo_etrace(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		if(!irccmp(parv[1], "-full"))
 			do_etrace_full(source_p);
-#ifdef IPV6
+#ifdef RB_IPV6
 		else if(!irccmp(parv[1], "-v6"))
 			do_etrace(source_p, 0, 1);
 		else if(!irccmp(parv[1], "-v4"))
@@ -151,7 +151,7 @@ do_etrace(struct Client *source_p, int ipv4, int ipv6)
 	{
 		target_p = ptr->data;
 
-#ifdef IPV6
+#ifdef RB_IPV6
 		if((!ipv4 && target_p->localClient->ip.ss_family == AF_INET) ||
 		   (!ipv6 && target_p->localClient->ip.ss_family == AF_INET6))
 			continue;
@@ -213,7 +213,7 @@ do_single_etrace(struct Client *source_p, struct Client *target_p)
 }
 
 static int
-mo_chantrace(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_chantrace(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
 	struct Channel *chptr;
@@ -415,10 +415,10 @@ mo_masktrace(struct Client *client_p, struct Client *source_p, int parc,
 		if (!ConfigFileEntry.operspy_dont_care_user_info)
 		{
 			char buf[512];
-			strlcpy(buf, mask, sizeof(buf));
+			rb_strlcpy(buf, mask, sizeof(buf));
 			if(!EmptyString(gecos)) {
-				strlcat(buf, " ", sizeof(buf));
-				strlcat(buf, gecos, sizeof(buf));
+				rb_strlcat(buf, " ", sizeof(buf));
+				rb_strlcat(buf, gecos, sizeof(buf));
 			}		
 
 			report_operspy(source_p, "MASKTRACE", buf);