From 12cee8ab784abba32ec21d3eb2c7890f86003837 Mon Sep 17 00:00:00 2001 From: Jess Porter Date: Fri, 1 Jul 2022 00:07:02 +0100 Subject: [PATCH] global masktrace doesn't need to be an operspy action --- modules/m_etrace.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/modules/m_etrace.c b/modules/m_etrace.c index 595a8bd5..abeedc89 100644 --- a/modules/m_etrace.c +++ b/modules/m_etrace.c @@ -340,20 +340,10 @@ mo_masktrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *so const char *parv[]) { char *name, *username, *hostname, *gecos; - const char *mask; - int operspy = 0; - mask = parv[1]; name = LOCAL_COPY(parv[1]); collapse(name); - if(IsOperSpy(source_p) && parv[1][0] == '!') - { - name++; - mask++; - operspy = 1; - } - if(parc > 2 && !EmptyString(parv[2])) { gecos = LOCAL_COPY(parv[2]); @@ -383,21 +373,6 @@ mo_masktrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *so return; } - if(operspy) { - if (!ConfigFileEntry.operspy_dont_care_user_info) - { - char buf[512]; - rb_strlcpy(buf, mask, sizeof(buf)); - if(!EmptyString(gecos)) { - rb_strlcat(buf, " ", sizeof(buf)); - rb_strlcat(buf, gecos, sizeof(buf)); - } - - report_operspy(source_p, "MASKTRACE", buf); - } - match_masktrace(source_p, &global_client_list, username, hostname, name, gecos); - } else - match_masktrace(source_p, &lclient_list, username, hostname, name, gecos); - + match_masktrace(source_p, &global_client_list, username, hostname, name, gecos); sendto_one_numeric(source_p, RPL_ENDOFTRACE, form_str(RPL_ENDOFTRACE), me.name); }