strlcat -> rb_strlcat

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

diff --git a/modules/m_etrace.c b/modules/m_etrace.c
index 6cf9cb3bad1e185467f71c1f500e75332320d8fc..9e2998dabf7051965402b328c348e61c787a8704 100644 (file)
--- a/modules/m_etrace.c
+++ b/modules/m_etrace.c
@@ -42,7 +42,6 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
@@ -92,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"))
@@ -152,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;
@@ -416,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);