summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/core/m_error.c20
-rw-r--r--modules/core/m_join.c8
-rw-r--r--modules/core/m_kill.c6
-rw-r--r--modules/core/m_message.c4
-rw-r--r--modules/core/m_nick.c31
-rw-r--r--modules/core/m_server.c70
-rw-r--r--modules/core/m_sjoin.c8
-rw-r--r--modules/core/m_squit.c3
-rw-r--r--modules/m_admin.c2
-rw-r--r--modules/m_challenge.c3
-rw-r--r--modules/m_dline.c10
-rw-r--r--modules/m_eob.c3
-rw-r--r--modules/m_etrace.c2
-rw-r--r--modules/m_gline.c24
-rw-r--r--modules/m_globops.c4
-rw-r--r--modules/m_info.c2
-rw-r--r--modules/m_kline.c10
-rw-r--r--modules/m_links.c2
-rw-r--r--modules/m_module.c5
-rw-r--r--modules/m_motd.c2
-rw-r--r--modules/m_oper.c15
-rw-r--r--modules/m_post.c2
-rw-r--r--modules/m_rehash.c10
-rw-r--r--modules/m_resv.c12
-rw-r--r--modules/m_set.c33
-rw-r--r--modules/m_stats.c2
-rw-r--r--modules/m_svinfo.c10
-rw-r--r--modules/m_trace.c2
-rw-r--r--modules/m_xline.c6
29 files changed, 167 insertions, 144 deletions
diff --git a/modules/core/m_error.c b/modules/core/m_error.c
index 9228628..096538e 100644
--- a/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@ -51,17 +51,21 @@ m_error(struct Client *client_p, struct Client *source_p,
if (client_p == source_p)
{
- sendto_realops_flags(UMODE_ALL, L_ADMIN, "ERROR :from %s -- %s",
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
+ "ERROR :from %s -- %s",
get_client_name(client_p, HIDE_IP), para);
- sendto_realops_flags(UMODE_ALL, L_OPER, "ERROR :from %s -- %s",
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
+ "ERROR :from %s -- %s",
get_client_name(client_p, MASK_IP), para);
}
else
{
- sendto_realops_flags(UMODE_ALL, L_OPER, "ERROR :from %s via %s -- %s",
- source_p->name, get_client_name(client_p, MASK_IP), para);
- sendto_realops_flags(UMODE_ALL, L_ADMIN, "ERROR :from %s via %s -- %s",
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
+ "ERROR :from %s via %s -- %s",
source_p->name, get_client_name(client_p, HIDE_IP), para);
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
+ "ERROR :from %s via %s -- %s",
+ source_p->name, get_client_name(client_p, MASK_IP), para);
}
if (MyClient(source_p))
@@ -80,10 +84,12 @@ ms_error(struct Client *client_p, struct Client *source_p,
source_p->name, para);
if (client_p == source_p)
- sendto_realops_flags(UMODE_ALL, L_ALL, "ERROR :from %s -- %s",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "ERROR :from %s -- %s",
get_client_name(client_p, MASK_IP), para);
else
- sendto_realops_flags(UMODE_ALL, L_ALL, "ERROR :from %s via %s -- %s",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "ERROR :from %s via %s -- %s",
source_p->name,
get_client_name(client_p, MASK_IP), para);
}
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 35bbf3a..7f872f7 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -138,7 +138,7 @@ m_join(struct Client *client_p, struct Client *source_p,
{
sendto_one(source_p, form_str(ERR_BADCHANNAME),
me.name, source_p->name, chan);
- sendto_realops_flags(UMODE_SPY, L_ALL,
+ sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
"Forbidding reserved channel [%s] from user %s",
chan, get_client_name(source_p, HIDE_IP));
continue;
@@ -302,7 +302,7 @@ ms_join(struct Client *client_p, struct Client *source_p,
if (!check_channel_name(parv[2], 0))
{
- sendto_realops_flags(UMODE_DEBUG, L_ALL,
+ sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
"*** Too long or invalid channel name from %s: %s",
client_p->name, parv[2]);
return;
@@ -326,7 +326,7 @@ ms_join(struct Client *client_p, struct Client *source_p,
{
if (newts < 800000000)
{
- sendto_realops_flags(UMODE_DEBUG, L_ALL,
+ sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
"*** Bogus TS %lu on %s ignored from %s",
(unsigned long)newts, chptr->chname,
client_p->name);
@@ -341,7 +341,7 @@ ms_join(struct Client *client_p, struct Client *source_p,
sendto_channel_local(ALL_MEMBERS, 0, chptr,
":%s NOTICE %s :*** Notice -- TS for %s changed from %lu to 0",
me.name, chptr->chname, chptr->chname, (unsigned long)oldts);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Server %s changing TS on %s from %lu to 0",
source_p->name, chptr->chname, (unsigned long)oldts);
}
diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index a76e5a4..7686b77 100644
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -151,7 +151,7 @@ mo_kill(struct Client *client_p, struct Client *source_p,
* Do not change the format of this message. There's no point in changing messages
* that have been around for ever, for no reason..
*/
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Received KILL message for %s. From %s Path: %s (%s)",
target_p->name, source_p->name, me.name, reason);
@@ -278,12 +278,12 @@ ms_kill(struct Client *client_p, struct Client *source_p,
* local --fl
*/
if (HasUMode(source_p, UMODE_OPER)) /* send it normally */
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Received KILL message for %s. From %s Path: %s!%s!%s!%s %s",
target_p->name, source_p->name, source_p->servptr->name,
source_p->host, source_p->username, source_p->name, reason);
else
- sendto_realops_flags(UMODE_SKILL, L_ALL,
+ sendto_realops_flags(UMODE_SKILL, L_ALL, SEND_NOTICE,
"Received KILL message for %s. From %s %s",
target_p->name, source_p->name, reason);
diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 183154f..e72126d 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -620,7 +620,7 @@ flood_attack_client(int p_or_n, struct Client *source_p,
{
if (!HasFlag(target_p, FLAGS_FLOOD_NOTICED))
{
- sendto_realops_flags(UMODE_BOTS, L_ALL,
+ sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
"Possible Flooder %s on %s target: %s",
get_client_name(source_p, HIDE_IP),
source_p->servptr->name, target_p->name);
@@ -676,7 +676,7 @@ flood_attack_channel(int p_or_n, struct Client *source_p,
{
if (!IsSetFloodNoticed(chptr))
{
- sendto_realops_flags(UMODE_BOTS, L_ALL,
+ sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
"Possible Flooder %s on %s target: %s",
get_client_name(source_p, HIDE_IP),
source_p->servptr->name, chptr->chname);
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 68f4e57..36dfcc9 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -145,7 +145,8 @@ change_local_nick(struct Client *source_p, const char *nick)
/* XXX - the format of this notice should eventually be changed
* to either %s[%s@%s], or even better would be get_client_name() -bill
*/
- sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
+ sendto_realops_flags(UMODE_NCHANGE, L_ALL, SEND_NOTICE,
+ "Nick change: From %s to %s [%s@%s]",
source_p->name, nick, source_p->username, source_p->host);
sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
source_p->name, source_p->username,
@@ -225,7 +226,7 @@ mr_nick(struct Client *client_p, struct Client *source_p,
{
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name,
source_p->name[0] ? source_p->name : "*", nick);
- sendto_realops_flags(L_ALL, UMODE_REJ,
+ sendto_realops_flags(L_ALL, UMODE_REJ, SEND_NOTICE,
"Forbidding reserved nick [%s] from user %s",
nick, get_client_name(client_p, HIDE_IP));
return;
@@ -291,7 +292,7 @@ m_nick(struct Client *client_p, struct Client *source_p,
{
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
me.name, source_p->name, nick);
- sendto_realops_flags(L_ALL, UMODE_REJ,
+ sendto_realops_flags(L_ALL, UMODE_REJ, SEND_NOTICE,
"Forbidding reserved nick [%s] from user %s",
nick, get_client_name(client_p, HIDE_IP));
return;
@@ -382,7 +383,7 @@ ms_nick(struct Client *client_p, struct Client *source_p,
if (server_p == NULL)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Invalid server %s from %s for NICK %s",
parv[7], source_p->name, parv[1]);
sendto_one(client_p, ":%s KILL %s :%s (Server doesn't exist!)",
@@ -495,7 +496,7 @@ ms_uid(struct Client *client_p, struct Client *source_p,
*/
if ((target_p = hash_find_id(parv[8])) != NULL)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"ID collision on %s(%s <- %s)(both killed)",
target_p->name, target_p->from->name,
client_p->name);
@@ -542,7 +543,7 @@ check_clean_nick(struct Client *client_p, struct Client *source_p,
if (!valid_nickname(nick, 0))
{
++ServerStats.is_kill;
- sendto_realops_flags(UMODE_DEBUG, L_ALL,
+ sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
"Bad/long Nick: %s From: %s(via %s)",
nick, server_p->name, client_p->name);
@@ -581,7 +582,7 @@ check_clean_user(struct Client *client_p, char *nick,
if (!clean_user_name(user))
{
++ServerStats.is_kill;
- sendto_realops_flags(UMODE_DEBUG, L_ALL,
+ sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
"Bad/Long Username: %s Nickname: %s From: %s(via %s)",
user, nick, server_p->name, client_p->name);
sendto_one(client_p, ":%s KILL %s :%s (Bad Username)",
@@ -608,7 +609,7 @@ check_clean_host(struct Client *client_p, char *nick,
if (!clean_host_name(host))
{
++ServerStats.is_kill;
- sendto_realops_flags(UMODE_DEBUG, L_ALL,
+ sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
"Bad/Long Hostname: %s Nickname: %s From: %s(via %s)",
host, nick, server_p->name, client_p->name);
sendto_one(client_p, ":%s KILL %s :%s (Bad Hostname)",
@@ -803,7 +804,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
/* if we dont have a ts, or their TS's are the same, kill both */
if (!newts || !target_p->tsinfo || (newts == target_p->tsinfo))
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Nick collision on %s(%s <- %s)(both killed)",
target_p->name, target_p->from->name,
client_p->name);
@@ -845,7 +846,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
else
{
if (sameuser)
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Nick collision on %s(%s <- %s)(older killed)",
target_p->name, target_p->from->name,
client_p->name);
@@ -882,7 +883,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
/* its a client changing nick and causing a collide */
if (!newts || !target_p->tsinfo || (newts == target_p->tsinfo))
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Nick change collision from %s to %s(%s <- %s)(both killed)",
source_p->name, target_p->name, target_p->from->name,
client_p->name);
@@ -914,12 +915,12 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
(!sameuser && newts > target_p->tsinfo))
{
if (sameuser)
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Nick change collision from %s to %s(%s <- %s)(older killed)",
source_p->name, target_p->name, target_p->from->name,
client_p->name);
else
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Nick change collision from %s to %s(%s <- %s)(newer killed)",
source_p->name, target_p->name, target_p->from->name,
client_p->name);
@@ -940,12 +941,12 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
else
{
if (sameuser)
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Nick collision on %s(%s <- %s)(older killed)",
target_p->name, target_p->from->name,
client_p->name);
else
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Nick collision on %s(%s <- %s)(newer killed)",
target_p->name, target_p->from->name,
client_p->name);
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 6054a34..ed4ca7f 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -70,10 +70,10 @@ mr_server(struct Client *client_p, struct Client *source_p,
*/
if (!DoesTS(client_p))
{
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Unauthorized server connection attempt from %s: Non-TS server "
"for server %s", get_client_name(client_p, HIDE_IP), name);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Unauthorized server connection attempt from %s: Non-TS server "
"for server %s", get_client_name(client_p, MASK_IP), name);
exit_client(client_p, client_p, "Non-TS server");
@@ -82,7 +82,7 @@ mr_server(struct Client *client_p, struct Client *source_p,
if (!valid_servname(name))
{
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Unauthorized server connection attempt from %s: Bogus server name "
"for server %s", get_client_name(client_p, HIDE_IP), name);
sendto_realops_flags(UMODE_ALL, L_OPER,
@@ -100,11 +100,11 @@ mr_server(struct Client *client_p, struct Client *source_p,
case -1:
if (ConfigFileEntry.warn_no_nline)
{
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Unauthorized server connection attempt from %s: No entry for "
"servername %s", get_client_name(client_p, HIDE_IP), name);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Unauthorized server connection attempt from %s: No entry for "
"servername %s", get_client_name(client_p, MASK_IP), name);
}
@@ -115,11 +115,11 @@ mr_server(struct Client *client_p, struct Client *source_p,
break;
case -2:
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Unauthorized server connection attempt from %s: Bad password "
"for server %s", get_client_name(client_p, HIDE_IP), name);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Unauthorized server connection attempt from %s: Bad password "
"for server %s", get_client_name(client_p, MASK_IP), name);
@@ -129,11 +129,11 @@ mr_server(struct Client *client_p, struct Client *source_p,
break;
case -3:
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Unauthorized server connection attempt from %s: Invalid host "
"for server %s", get_client_name(client_p, HIDE_IP), name);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Unauthorized server connection attempt from %s: Invalid host "
"for server %s", get_client_name(client_p, MASK_IP), name);
@@ -156,11 +156,11 @@ mr_server(struct Client *client_p, struct Client *source_p,
* Definitely don't do that here. This is from an unregistered
* connect - A1kmm.
*/
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Attempt to re-introduce server %s SID %s from %s",
name, client_p->id,
get_client_name(client_p, HIDE_IP));
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Attempt to re-introduce server %s SID %s from %s",
name, client_p->id,
get_client_name(client_p, MASK_IP));
@@ -219,10 +219,10 @@ ms_server(struct Client *client_p, struct Client *source_p,
if (!valid_servname(name))
{
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s introduced server with bogus server name %s",
get_client_name(client_p, SHOW_IP), name);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s introduced server with bogus server name %s",
get_client_name(client_p, MASK_IP), name);
sendto_one(client_p, "ERROR :Bogus server name introduced");
@@ -250,10 +250,10 @@ ms_server(struct Client *client_p, struct Client *source_p,
* solution.. --fl_
*/
sendto_one(client_p, "ERROR :Server %s already exists", name);
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s cancelled, server %s already exists",
get_client_name(client_p, SHOW_IP), name);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s cancelled, server %s already exists",
client_p->name, name);
exit_client(client_p, &me, "Server Exists");
@@ -314,9 +314,11 @@ ms_server(struct Client *client_p, struct Client *source_p,
if (!hlined)
{
/* OOOPs nope can't HUB */
- sendto_realops_flags(UMODE_ALL, L_ADMIN, "Non-Hub link %s introduced %s.",
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
+ "Non-Hub link %s introduced %s.",
get_client_name(client_p, HIDE_IP), name);
- sendto_realops_flags(UMODE_ALL, L_OPER, "Non-Hub link %s introduced %s.",
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
+ "Non-Hub link %s introduced %s.",
get_client_name(client_p, MASK_IP), name);
exit_client(source_p, &me, "No matching hub_mask.");
return;
@@ -326,10 +328,10 @@ ms_server(struct Client *client_p, struct Client *source_p,
if (llined)
{
/* OOOPs nope can't HUB this leaf */
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s introduced leafed server %s.",
get_client_name(client_p, HIDE_IP), name);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s introduced leafed server %s.",
get_client_name(client_p, MASK_IP), name);
/* If it is new, we are probably misconfigured, so split the
@@ -366,7 +368,7 @@ ms_server(struct Client *client_p, struct Client *source_p,
source_p->name, target_p->name, hop + 1,
IsHidden(target_p) ? "(H) " : "", target_p->info);
- sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
+ sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
"Server %s being introduced by %s",
target_p->name, source_p->name);
}
@@ -403,10 +405,10 @@ ms_sid(struct Client *client_p, struct Client *source_p,
if (!valid_servname(parv[1]))
{
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s introduced server with bogus server name %s",
get_client_name(client_p, SHOW_IP), parv[1]);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s introduced server with bogus server name %s",
get_client_name(client_p, MASK_IP), parv[1]);
sendto_one(client_p, "ERROR :Bogus server name introduced");
@@ -416,10 +418,10 @@ ms_sid(struct Client *client_p, struct Client *source_p,
if (!valid_sid(parv[3]))
{
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s introduced server with bogus server ID %s",
get_client_name(client_p, SHOW_IP), parv[3]);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s introduced server with bogus server ID %s",
get_client_name(client_p, MASK_IP), parv[3]);
sendto_one(client_p, "ERROR :Bogus server ID introduced");
@@ -431,10 +433,10 @@ ms_sid(struct Client *client_p, struct Client *source_p,
if ((target_p = hash_find_id(parv[3])))
{
sendto_one(client_p, "ERROR :SID %s already exists", parv[3]);
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s cancelled, SID %s already exists",
get_client_name(client_p, SHOW_IP), parv[3]);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s cancelled, SID %s already exists",
client_p->name, parv[3]);
exit_client(client_p, &me, "SID Exists");
@@ -445,10 +447,10 @@ ms_sid(struct Client *client_p, struct Client *source_p,
if ((target_p = hash_find_server(parv[1])))
{
sendto_one(client_p, "ERROR :Server %s already exists", parv[1]);
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s cancelled, server %s already exists",
get_client_name(client_p, SHOW_IP), parv[1]);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s cancelled, server %s already exists",
client_p->name, parv[1]);
exit_client(client_p, &me, "Server Exists");
@@ -510,9 +512,11 @@ ms_sid(struct Client *client_p, struct Client *source_p,
if (!hlined)
{
/* OOOPs nope can't HUB */
- sendto_realops_flags(UMODE_ALL, L_ADMIN, "Non-Hub link %s introduced %s.",
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
+ "Non-Hub link %s introduced %s.",
get_client_name(client_p, SHOW_IP), parv[1]);
- sendto_realops_flags(UMODE_ALL, L_OPER, "Non-Hub link %s introduced %s.",
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
+ "Non-Hub link %s introduced %s.",
get_client_name(client_p, MASK_IP), parv[1]);
exit_client(source_p, &me, "No matching hub_mask.");
return;
@@ -522,10 +526,10 @@ ms_sid(struct Client *client_p, struct Client *source_p,
if (llined)
{
/* OOOPs nope can't HUB this leaf */
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s introduced leafed server %s.",
get_client_name(client_p, SHOW_IP), parv[1]);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s introduced leafed server %s.",
get_client_name(client_p, MASK_IP), parv[1]);
exit_client(client_p, &me, "Leafed Server.");
@@ -560,7 +564,7 @@ ms_sid(struct Client *client_p, struct Client *source_p,
source_p->name, target_p->name, hop + 1,
IsHidden(target_p) ? "(H) " : "", target_p->info);
- sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
+ sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
"Server %s being introduced by %s",
target_p->name, source_p->name);
}
diff --git a/modules/core/m_sjoin.c b/modules/core/m_sjoin.c
index 72f1bda..a072183 100644
--- a/modules/core/m_sjoin.c
+++ b/modules/core/m_sjoin.c
@@ -104,7 +104,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p,
if (!check_channel_name(parv[2], 0))
{
- sendto_realops_flags(UMODE_DEBUG, L_ALL,
+ sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
"*** Too long or invalid channel name from %s: %s",
client_p->name, parv[2]);
return;
@@ -181,7 +181,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p,
{
if (newts < 800000000)
{
- sendto_realops_flags(UMODE_DEBUG, L_ALL,
+ sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
"*** Bogus TS %lu on %s ignored from %s",
(unsigned long)newts, chptr->chname,
client_p->name);
@@ -196,7 +196,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p,
sendto_channel_local(ALL_MEMBERS, 0, chptr,
":%s NOTICE %s :*** Notice -- TS for %s changed from %lu to 0",
me.name, chptr->chname, chptr->chname, (unsigned long)oldts);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Server %s changing TS on %s from %lu to 0",
source_p->name, chptr->chname, (unsigned long)oldts);
}
@@ -285,7 +285,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p,
*/
if (buflen >= (IRCD_BUFSIZE - IRCD_MAX(NICKLEN, IDLEN) - 2 - 3 - 1))
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Long SJOIN from server: %s(via %s) (ignored)",
source_p->name, client_p->name);
return;
diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index 0995c47..7ba9b43 100644
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -100,7 +100,8 @@ mo_squit(struct Client *client_p, struct Client *source_p,
if (MyConnect(target_p))
{
- sendto_realops_flags(UMODE_ALL, L_ALL, "Received SQUIT %s from %s (%s)",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "Received SQUIT %s from %s (%s)",
target_p->name, get_client_name(source_p, HIDE_IP), comment);
ilog(LOG_TYPE_IRCD, "Received SQUIT %s from %s (%s)",
target_p->name, get_client_name(source_p, HIDE_IP), comment);
diff --git a/modules/m_admin.c b/modules/m_admin.c
index b66f649..9db6fa9 100644
--- a/modules/m_admin.c
+++ b/modules/m_admin.c
@@ -47,7 +47,7 @@ do_admin(struct Client *source_p)
const char *me_name = ID_or_name(&me, source_p->from);
const char *nick = ID_or_name(source_p, source_p->from);
- sendto_realops_flags(UMODE_SPY, L_ALL,
+ sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
"ADMIN requested by %s (%s@%s) [%s]",
source_p->name, source_p->username,
source_p->host, source_p->servptr->name);
diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 4c24b3a..027d143 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -50,7 +50,8 @@ failed_challenge_notice(struct Client *source_p, const char *name,
const char *reason)
{
if (ConfigFileEntry.failed_oper_notice)
- sendto_realops_flags(UMODE_ALL, L_ALL, "Failed CHALLENGE attempt as %s "
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "Failed CHALLENGE attempt as %s "
"by %s (%s@%s) - %s", name, source_p->name,
source_p->username, source_p->host, reason);
diff --git a/modules/m_dline.c b/modules/m_dline.c
index 182489b..8c4c33d 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -62,7 +62,7 @@ apply_tdline(struct Client *source_p, struct ConfItem *conf,
add_conf_by_address(CONF_DLINE, aconf);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s added temporary %d min. D-Line for [%s] [%s]",
get_oper_name(source_p), tkline_time/60,
aconf->host, aconf->reason);
@@ -468,7 +468,7 @@ mo_undline(struct Client *client_p, struct Client *source_p,
sendto_one(source_p,
":%s NOTICE %s :Un-Dlined [%s] from temporary D-Lines",
me.name, source_p->name, addr);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the temporary D-Line for: [%s]",
get_oper_name(source_p), addr);
ilog(LOG_TYPE_DLINE, "%s removed temporary D-Line for [%s]",
@@ -480,7 +480,7 @@ mo_undline(struct Client *client_p, struct Client *source_p,
{
sendto_one(source_p, ":%s NOTICE %s :D-Line for [%s] is removed",
me.name, source_p->name, addr);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the D-Line for: [%s]",
get_oper_name(source_p), addr);
ilog(LOG_TYPE_DLINE, "%s removed D-Line for [%s]",
@@ -515,7 +515,7 @@ me_undline(struct Client *client_p, struct Client *source_p,
sendto_one(source_p,
":%s NOTICE %s :Un-Dlined [%s] from temporary D-Lines",
me.name, source_p->name, addr);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the temporary D-Line for: [%s]",
get_oper_name(source_p), addr);
ilog(LOG_TYPE_DLINE, "%s removed temporary D-Line for [%s]",
@@ -527,7 +527,7 @@ me_undline(struct Client *client_p, struct Client *source_p,
{
sendto_one(source_p, ":%s NOTICE %s :D-Line for [%s] is removed",
me.name, source_p->name, addr);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the D-Line for: [%s]",
get_oper_name(source_p), addr);
ilog(LOG_TYPE_DLINE, "%s removed D-Line for [%s]",
diff --git a/modules/m_eob.c b/modules/m_eob.c
index ceeff0c..bf3bc14 100644
--- a/modules/m_eob.c
+++ b/modules/m_eob.c
@@ -42,7 +42,8 @@ ms_eob(struct Client *client_p, struct Client *source_p,
assert(IsServer(source_p));
assert(client_p == source_p);
- sendto_realops_flags(UMODE_ALL, L_ALL, "End of burst from %s (%u seconds)",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "End of burst from %s (%u seconds)",
source_p->name,
(unsigned int)(CurrentTime - source_p->localClient->firsttime));
AddFlag(source_p, FLAGS_EOB);
diff --git a/modules/m_etrace.c b/modules/m_etrace.c
index 28b80ae..8a3421b 100644
--- a/modules/m_etrace.c
+++ b/modules/m_etrace.c
@@ -53,7 +53,7 @@ do_etrace(struct Client *source_p, int parc, char *parv[])
int full_etrace = 0;
dlink_node *ptr;
- sendto_realops_flags(UMODE_SPY, L_ALL,
+ sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
"ETRACE requested by %s (%s@%s) [%s]",
source_p->name, source_p->username,
source_p->host, source_p->servptr->name);
diff --git a/modules/m_gline.c b/modules/m_gline.c
index 1b29445..a1acdfd 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -77,7 +77,7 @@ set_local_gline(const struct Client *source_p, const char *user,
SetConfTemporary(aconf);
add_conf_by_address(CONF_GLINE, aconf);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s added G-Line for [%s@%s] [%s]",
get_oper_name(source_p),
aconf->user, aconf->host, aconf->reason);
@@ -215,7 +215,7 @@ check_majority(const struct Client *source_p, const char *user,
{
if (remove_gline_match(user, host))
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the G-Line for: [%s@%s]",
get_oper_name(source_p), user, host);
ilog(LOG_TYPE_GLINE, "%s removed G-Line for [%s@%s]",
@@ -296,10 +296,10 @@ do_sgline(struct Client *source_p, int parc, char *parv[], int prop)
if (bitlen < min_bitlen)
{
- sendto_realops_flags(UMODE_ALL, L_ALL, "%s!%s@%s on %s is requesting "
- "a GLINE with a CIDR mask < %d for [%s@%s] [%s]",
- source_p->name, source_p->username, source_p->host,
- source_p->servptr->name, min_bitlen, user, host, reason);
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "%s is requesting a GLINE with a CIDR mask < %d for [%s@%s] [%s]",
+ get_oper_name(source_p), min_bitlen,
+ user, host, reason);
return;
}
}
@@ -309,11 +309,12 @@ do_sgline(struct Client *source_p, int parc, char *parv[], int prop)
if (check_majority(source_p, user, host, reason, GLINE_PENDING_ADD_TYPE) ==
GLINE_ALREADY_VOTED)
{
- sendto_realops_flags(UMODE_ALL, L_ALL, "oper or server has already voted");
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "oper or server has already voted");
return;
}
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s requesting G-Line for [%s@%s] [%s]",
get_oper_name(source_p),
user, host, reason);
@@ -391,7 +392,7 @@ mo_gline(struct Client *client_p, struct Client *source_p,
* call these two functions first so the 'requesting' notice always comes
* before the 'has triggered' notice. -bill
*/
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s requesting G-Line for [%s@%s] [%s]",
get_oper_name(source_p),
user, host, reason);
@@ -444,7 +445,7 @@ do_sungline(struct Client *source_p, const char *user,
{
assert(source_p->servptr != NULL);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s requesting UNG-Line for [%s@%s] [%s]",
get_oper_name(source_p), user, host, reason);
ilog(LOG_TYPE_GLINE, "#ungline for %s@%s [%s] requested by %s",
@@ -453,7 +454,8 @@ do_sungline(struct Client *source_p, const char *user,
/* If at least 3 opers agree this user should be un G lined then do it */
if (check_majority(source_p, user, host, reason, GLINE_PENDING_DEL_TYPE) ==
GLINE_ALREADY_VOTED)
- sendto_realops_flags(UMODE_ALL, L_ALL, "oper or server has already voted");
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "oper or server has already voted");
if (prop)
{
diff --git a/modules/m_globops.c b/modules/m_globops.c
index 9f9c2eb..8cf3ed7 100644
--- a/modules/m_globops.c
+++ b/modules/m_globops.c
@@ -64,7 +64,7 @@ mo_globops(struct Client *client_p, struct Client *source_p,
sendto_server(NULL, NOCAPS, CAP_TS6,
":%s GLOBOPS :%s", source_p->name, message);
- sendto_globops_flags(UMODE_ALL, L_ALL, "from: %s: %s",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_GLOBAL, "from: %s: %s",
source_p->name, message);
}
@@ -80,7 +80,7 @@ ms_globops(struct Client *client_p, struct Client *source_p,
sendto_server(client_p, NOCAPS, CAP_TS6, ":%s GLOBOPS :%s",
source_p->name, parv[1]);
- sendto_globops_flags(UMODE_ALL, L_ALL, "from: %s: %s",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_GLOBAL, "from: %s: %s",
source_p->name, parv[1]);
}
diff --git a/modules/m_info.c b/modules/m_info.c
index c3e81d7..2e4d7be 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -541,7 +541,7 @@ send_info_text(struct Client *source_p)
const char **text = infotext;
char *source, *target;
- sendto_realops_flags(UMODE_SPY, L_ALL,
+ sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
"INFO requested by %s (%s@%s) [%s]",
source_p->name, source_p->username,
source_p->host, source_p->servptr->name);
diff --git a/modules/m_kline.c b/modules/m_kline.c
index 8833fe5..9270d0f 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -266,7 +266,7 @@ apply_tkline(struct Client *source_p, struct ConfItem *conf,
SetConfTemporary(aconf);
add_conf_by_address(CONF_KLINE, aconf);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s added temporary %d min. K-Line for [%s@%s] [%s]",
get_oper_name(source_p), tkline_time/60,
aconf->user, aconf->host,
@@ -386,7 +386,7 @@ mo_unkline(struct Client *client_p,struct Client *source_p,
sendto_one(source_p,
":%s NOTICE %s :Un-klined [%s@%s] from temporary K-Lines",
me.name, source_p->name, user, host);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the temporary K-Line for: [%s@%s]",
get_oper_name(source_p), user, host);
ilog(LOG_TYPE_KLINE, "%s removed temporary K-Line for [%s@%s]",
@@ -398,7 +398,7 @@ mo_unkline(struct Client *client_p,struct Client *source_p,
{
sendto_one(source_p, ":%s NOTICE %s :K-Line for [%s@%s] is removed",
me.name, source_p->name, user,host);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the K-Line for: [%s@%s]",
get_oper_name(source_p), user, host);
ilog(LOG_TYPE_KLINE, "%s removed K-Line for [%s@%s]",
@@ -444,7 +444,7 @@ me_unkline(struct Client *client_p, struct Client *source_p,
sendto_one(source_p,
":%s NOTICE %s :Un-klined [%s@%s] from temporary K-Lines",
me.name, source_p->name, kuser, khost);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the temporary K-Line for: [%s@%s]",
get_oper_name(source_p), kuser, khost);
ilog(LOG_TYPE_KLINE, "%s removed temporary K-Line for [%s@%s]",
@@ -456,7 +456,7 @@ me_unkline(struct Client *client_p, struct Client *source_p,
{
sendto_one(source_p, ":%s NOTICE %s :K-Line for [%s@%s] is removed",
me.name, source_p->name, kuser, khost);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the K-Line for: [%s@%s]",
get_oper_name(source_p), kuser, khost);
diff --git a/modules/m_links.c b/modules/m_links.c
index 04192d4..0ad525b 100644
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -38,7 +38,7 @@
static void
do_links(struct Client *source_p, int parc, char *parv[])
{
- sendto_realops_flags(UMODE_SPY, L_ALL,
+ sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
"LINKS requested by %s (%s@%s) [%s]",
source_p->name,
source_p->username, source_p->host,
diff --git a/modules/m_module.c b/modules/m_module.c
index a3a2d34..755810c 100644
--- a/modules/m_module.c
+++ b/modules/m_module.c
@@ -165,7 +165,7 @@ mo_module(struct Client *client_p, struct Client *source_p,
load_conf_modules();
load_core_modules(0);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Module Restart: %u modules unloaded, %u modules loaded",
modnum, dlink_list_length(&modules_list));
ilog(LOG_TYPE_IRCD, "Module Restart: %u modules unloaded, %u modules loaded",
@@ -199,7 +199,8 @@ mo_module(struct Client *client_p, struct Client *source_p,
if ((load_one_module(parv[2]) == -1) && check_core)
{
- sendto_realops_flags(UMODE_ALL, L_ALL, "Error reloading core "
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "Error reloading core "
"module: %s: terminating ircd", parv[2]);
ilog(LOG_TYPE_IRCD, "Error loading core module %s: terminating ircd", parv[2]);
exit(0);
diff --git a/modules/m_motd.c b/modules/m_motd.c
index 4e0bd1c..805840f 100644
--- a/modules/m_motd.c
+++ b/modules/m_motd.c
@@ -38,7 +38,7 @@
static void
do_motd(struct Client *source_p)
{
- sendto_realops_flags(UMODE_SPY, L_ALL,
+ sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
"MOTD requested by %s (%s@%s) [%s]",
source_p->name, source_p->username,
source_p->host, source_p->servptr->name);
diff --git a/modules/m_oper.c b/modules/m_oper.c
index c325755..d58c11b 100644
--- a/modules/m_oper.c
+++ b/modules/m_oper.c
@@ -51,13 +51,14 @@ failed_oper_notice(struct Client *source_p, const char *name,
const char *reason)
{
if (ConfigFileEntry.failed_oper_notice)
- sendto_realops_flags(UMODE_ALL, L_ALL, "Failed OPER attempt as %s "
- "by %s (%s@%s) - %s", name, source_p->name,
- source_p->username, source_p->host, reason);
-
- ilog(LOG_TYPE_OPER, "Failed OPER attempt as %s "
- "by %s (%s@%s) - %s", name, source_p->name,
- source_p->username, source_p->host, reason);
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "Failed OPER attempt as %s by %s (%s@%s) - %s",
+ name, source_p->name, source_p->username,
+ source_p->host, reason);
+
+ ilog(LOG_TYPE_OPER, "Failed OPER attempt as %s by %s (%s@%s) - %s",
+ name, source_p->name, source_p->username,
+ source_p->host, reason);
}
/*
diff --git a/modules/m_post.c b/modules/m_post.c
index f8e6ff6..7dade59 100644
--- a/modules/m_post.c
+++ b/modules/m_post.c
@@ -39,7 +39,7 @@ static void
mr_dumb_proxy(struct Client *client_p, struct Client *source_p,
int parc, char *parv[])
{
- sendto_realops_flags(UMODE_REJ, L_ALL,
+ sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
"HTTP Proxy disconnected: [%s@%s]",
client_p->username, client_p->host);
exit_client(source_p, source_p, "Client Exit");
diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index f73c867..488291d 100644
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -58,7 +58,8 @@ mo_rehash(struct Client *client_p, struct Client *source_p,
if (irccmp(parv[1], "DNS") == 0)
{
sendto_one(source_p, form_str(RPL_REHASHING), me.name, source_p->name, "DNS");
- sendto_realops_flags(UMODE_ALL, L_ALL, "%s is rehashing DNS",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "%s is rehashing DNS",
get_oper_name(source_p));
restart_resolver(); /* re-read /etc/resolv.conf AGAIN?
and close/re-open res socket */
@@ -68,14 +69,15 @@ mo_rehash(struct Client *client_p, struct Client *source_p,
{
sendto_one(source_p, form_str(RPL_REHASHING), me.name,
source_p->name, "FDLIMIT");
- sendto_realops_flags(UMODE_ALL, L_ALL, "%s is updating FDLIMIT",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "%s is updating FDLIMIT",
get_oper_name(source_p));
recalc_fdlimit(NULL);
found = 1;
}
else if (irccmp(parv[1], "MOTD") == 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s is forcing re-reading of MOTD file",
get_oper_name(source_p));
read_message_file(&ConfigFileEntry.motd);
@@ -99,7 +101,7 @@ mo_rehash(struct Client *client_p, struct Client *source_p,
{
sendto_one(source_p, form_str(RPL_REHASHING),
me.name, source_p->name, ConfigFileEntry.configfile);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s is rehashing server config file",
get_oper_name(source_p));
ilog(LOG_TYPE_IRCD, "REHASH From %s[%s]",
diff --git a/modules/m_resv.c b/modules/m_resv.c
index e733ddc..e57a67e 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -240,7 +240,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
me.name, source_p->name,
tkline_time/60,
(MyClient(source_p) ? "local" : "remote"), name);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has placed a %d minute %s RESV on channel: %s [%s]",
get_oper_name(source_p),
tkline_time/60,
@@ -258,7 +258,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
":%s NOTICE %s :A %s RESV has been placed on channel %s",
me.name, source_p->name,
(MyClient(source_p) ? "local" : "remote"), name);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has placed a %s RESV on channel %s : [%s]",
get_oper_name(source_p),
(MyClient(source_p) ? "local" : "remote"),
@@ -302,7 +302,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
tkline_time/60,
(MyClient(source_p) ? "local" : "remote"),
conf->name, resv_p->reason);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has placed a %d minute %s RESV on nick %s : [%s]",
get_oper_name(source_p),
tkline_time/60,
@@ -321,7 +321,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
me.name, source_p->name,
(MyClient(source_p) ? "local" : "remote"),
conf->name, resv_p->reason);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has placed a %s RESV on nick %s : [%s]",
get_oper_name(source_p),
(MyClient(source_p) ? "local" : "remote"),
@@ -363,7 +363,7 @@ remove_resv(struct Client *source_p, const char *name)
sendto_one(source_p,
":%s NOTICE %s :The RESV has been removed on channel: %s",
me.name, source_p->name, name);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the RESV for channel: %s",
get_oper_name(source_p), name);
}
@@ -393,7 +393,7 @@ remove_resv(struct Client *source_p, const char *name)
sendto_one(source_p, ":%s NOTICE %s :The RESV has been removed on nick: %s",
me.name, source_p->name, name);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the RESV for nick: %s",
get_oper_name(source_p), name);
}
diff --git a/modules/m_set.c b/modules/m_set.c
index f17b4a6..2623283 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -152,7 +152,7 @@ quote_autoconn(struct Client *source_p, const char *arg, int newval)
else
ClearConfAllowAutoConn(aconf);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has changed AUTOCONN for %s to %i",
get_oper_name(source_p), arg, newval);
sendto_one(source_p,
@@ -178,7 +178,8 @@ quote_autoconnall(struct Client *source_p, int newval)
{
if (newval >= 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL, "%s has changed AUTOCONNALL to %i",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "%s has changed AUTOCONNALL to %i",
get_oper_name(source_p), newval);
GlobalSetOptions.autoconn = newval;
@@ -195,7 +196,7 @@ quote_floodcount(struct Client *source_p, int newval)
if (newval >= 0)
{
GlobalSetOptions.floodcount = newval;
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has changed FLOODCOUNT to %i",
get_oper_name(source_p), GlobalSetOptions.floodcount);
}
@@ -217,7 +218,7 @@ quote_identtimeout(struct Client *source_p, int newval)
if (newval > 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has changed IDENTTIMEOUT to %d",
get_oper_name(source_p), newval);
GlobalSetOptions.ident_timeout = newval;
@@ -253,7 +254,7 @@ quote_max(struct Client *source_p, int newval)
ServerInfo.max_clients = newval;
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s set new MAXCLIENTS to %d (%d current)",
get_oper_name(source_p), ServerInfo.max_clients, Count.local);
}
@@ -286,14 +287,15 @@ quote_spamnum(struct Client *source_p, int newval)
{
if (newval == 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has disabled ANTI_SPAMBOT", source_p->name);
GlobalSetOptions.spam_num = newval;
return;
}
GlobalSetOptions.spam_num = IRCD_MAX(newval, MIN_SPAM_NUM);
- sendto_realops_flags(UMODE_ALL, L_ALL, "%s has changed SPAMNUM to %i",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "%s has changed SPAMNUM to %i",
get_oper_name(source_p), GlobalSetOptions.spam_num);
}
else
@@ -308,7 +310,8 @@ quote_spamtime(struct Client *source_p, int newval)
if (newval > 0)
{
GlobalSetOptions.spam_time = IRCD_MAX(newval, MIN_SPAM_TIME);
- sendto_realops_flags(UMODE_ALL, L_ALL, "%s has changed SPAMTIME to %i",
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+ "%s has changed SPAMTIME to %i",
get_oper_name(source_p), GlobalSetOptions.spam_time);
}
else
@@ -350,7 +353,7 @@ quote_splitmode(struct Client *source_p, char *charval)
/* OFF */
if (newval == 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s is disabling splitmode",
get_oper_name(source_p));
@@ -362,7 +365,7 @@ quote_splitmode(struct Client *source_p, char *charval)
/* ON */
else if (newval == 1)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s is enabling and activating splitmode",
get_oper_name(source_p));
@@ -375,7 +378,7 @@ quote_splitmode(struct Client *source_p, char *charval)
/* AUTO */
else if (newval == 2)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s is enabling automatic splitmode",
get_oper_name(source_p));
@@ -399,7 +402,7 @@ quote_splitnum(struct Client *source_p, int newval)
{
if (newval >= 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has changed SPLITNUM to %i",
get_oper_name(source_p), newval);
split_servers = newval;
@@ -418,7 +421,7 @@ quote_splitusers(struct Client *source_p, int newval)
{
if (newval >= 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has changed SPLITUSERS to %i",
get_oper_name(source_p), newval);
split_users = newval;
@@ -437,7 +440,7 @@ quote_jfloodtime(struct Client *source_p, int newval)
{
if (newval >= 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has changed JFLOODTIME to %i",
get_oper_name(source_p), newval);
GlobalSetOptions.joinfloodtime = newval;
@@ -453,7 +456,7 @@ quote_jfloodcount(struct Client *source_p, int newval)
{
if (newval >= 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has changed JFLOODCOUNT to %i",
get_oper_name(source_p), newval);
GlobalSetOptions.joinfloodcount = newval;
diff --git a/modules/m_stats.c b/modules/m_stats.c
index 2361688..938b068 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -1398,7 +1398,7 @@ do_stats(struct Client *source_p, int parc, char *parv[])
break;
}
- sendto_realops_flags(UMODE_SPY, L_ALL,
+ sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
"STATS %c requested by %s (%s@%s) [%s]",
statchar, source_p->name, source_p->username,
source_p->host, source_p->servptr->name);
diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c
index bb36887..b3a693b 100644
--- a/modules/m_svinfo.c
+++ b/modules/m_svinfo.c
@@ -65,10 +65,10 @@ ms_svinfo(struct Client *client_p, struct Client *source_p,
* TS_ONLY we can't fall back to the non-TS protocol so
* we drop the link -orabidoo
*/
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s dropped, wrong TS protocol version (%s,%s)",
get_client_name(source_p, SHOW_IP), parv[1], parv[2]);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s dropped, wrong TS protocol version (%s,%s)",
get_client_name(source_p, MASK_IP), parv[1], parv[2]);
exit_client(source_p, source_p, "Incompatible TS version");
@@ -84,13 +84,13 @@ ms_svinfo(struct Client *client_p, struct Client *source_p,
if (deltat > ConfigFileEntry.ts_max_delta)
{
- sendto_realops_flags(UMODE_ALL, L_ADMIN,
+ sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
"Link %s dropped, excessive TS delta (my TS=%lu, their TS=%lu, delta=%d)",
get_client_name(source_p, SHOW_IP),
(unsigned long) CurrentTime,
(unsigned long) theirtime,
(int) deltat);
- sendto_realops_flags(UMODE_ALL, L_OPER,
+ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
"Link %s dropped, excessive TS delta (my TS=%lu, their TS=%lu, delta=%d)",
get_client_name(source_p, MASK_IP),
(unsigned long) CurrentTime,
@@ -107,7 +107,7 @@ ms_svinfo(struct Client *client_p, struct Client *source_p,
}
if (deltat > ConfigFileEntry.ts_warn_delta)
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"Link %s notable TS delta (my TS=%lu, their TS=%lu, delta=%d)",
source_p->name,
(unsigned long) CurrentTime,
diff --git a/modules/m_trace.c b/modules/m_trace.c
index 910b390..3694140 100644
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -186,7 +186,7 @@ do_actual_trace(struct Client *source_p, int parc, char *parv[])
to = source_p->name;
}
- sendto_realops_flags(UMODE_SPY, L_ALL,
+ sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
"TRACE requested by %s (%s@%s) [%s]",
source_p->name, source_p->username,
source_p->host, source_p->servptr->name);
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 3a70299..1020e09 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -353,7 +353,7 @@ write_xline(struct Client *source_p, char *gecos, char *reason,
if (tkline_time != 0)
{
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s added temporary %d min. X-Line for [%s] [%s]",
get_oper_name(source_p), (int)tkline_time/60,
conf->name, match_item->reason);
@@ -380,7 +380,7 @@ remove_xline(struct Client *source_p, char *gecos)
sendto_one(source_p,
":%s NOTICE %s :Un-xlined [%s] from temporary X-Lines",
me.name, source_p->name, gecos);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the temporary X-Line for: [%s]",
get_oper_name(source_p), gecos);
ilog(LOG_TYPE_KLINE, "%s removed temporary X-Line for [%s]",
@@ -392,7 +392,7 @@ remove_xline(struct Client *source_p, char *gecos)
{
sendto_one(source_p, ":%s NOTICE %s :X-Line for [%s] is removed",
me.name, source_p->name, gecos);
- sendto_realops_flags(UMODE_ALL, L_ALL,
+ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
"%s has removed the X-Line for: [%s]",
get_oper_name(source_p), gecos);
ilog(LOG_TYPE_KLINE, "%s removed X-Line for [%s]",