new function get_client_name_and_opername() add in s_misc.c
mirrored after get_client_name() which can return either nick/server or nick[ident@ip]
-diff -r bba899468eaf include/client.h
---- a/include/client.h Sat Jul 20 14:58:09 2013 +0100
-+++ b/include/client.h Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 include/client.h
+--- a/include/client.h Thu Jul 25 18:59:27 2013 +0100
++++ b/include/client.h Thu Jul 25 19:00:52 2013 +0100
@@ -819,6 +819,7 @@
#define IPV6USERBITS 64
extern const char* client_get_default_umode(const struct Client* sptr);
extern int client_get_ping(const struct Client* local_client);
extern void client_drop_sendq(struct Connection* con);
-diff -r bba899468eaf ircd/channel.c
---- a/ircd/channel.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/channel.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/channel.c
+--- a/ircd/channel.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/channel.c Thu Jul 25 19:00:52 2013 +0100
@@ -1917,8 +1917,8 @@
if (mbuf->mb_dest & MODEBUF_DEST_HACK4)
sendto_opmask_butone(0, SNO_HACK4, "HACK(4): %s MODE %s %s%s%s%s%s%s "
mbuf->mb_channel->chname,
rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
addbuf, remstr, addstr,
-diff -r bba899468eaf ircd/gline.c
---- a/ircd/gline.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/gline.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/gline.c
+--- a/ircd/gline.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/gline.c Thu Jul 25 19:00:52 2013 +0100
@@ -576,7 +576,7 @@
SNO_AUTO, "%s adding %s%s %s for %s%s%s%s%s, expiring at "
"%Tu: %s",
GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : gline->gl_nick,
GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : "!",
-@@ -978,7 +978,7 @@
+@@ -981,7 +981,7 @@
/* Inform ops and log it */
sendto_opmask_butone(0, SNO_GLINE, "%s removing local %s for %s%s%s%s%s",
(feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : gline->gl_nick,
GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : "!",
-diff -r bba899468eaf ircd/jupe.c
---- a/ircd/jupe.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/jupe.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/jupe.c
+--- a/ircd/jupe.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/jupe.c Thu Jul 25 19:00:52 2013 +0100
@@ -156,7 +156,7 @@
sendto_opmask_butone(0, SNO_NETWORK, "%s adding %sJUPE for %s, expiring at "
"%Tu: %s",
cli_name((cli_user(sptr))->server),
JupeIsLocal(jupe) ? "removing local" : "deactivating",
jupe->ju_server, jupe->ju_expire + TSoffset,
-diff -r bba899468eaf ircd/m_connect.c
---- a/ircd/m_connect.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/m_connect.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/m_connect.c
+--- a/ircd/m_connect.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/m_connect.c Thu Jul 25 19:00:52 2013 +0100
@@ -197,7 +197,7 @@
sendwallto_group_butone(&me, WALL_WALLOPS, 0,
"Remote CONNECT %s %s from %s", aconf->name,
log_write(LS_NETWORK, L_INFO, 0, "CONNECT From %C : %s %s", sptr, aconf->name,
parv[2] ? parv[2] : "");
-diff -r bba899468eaf ircd/m_join.c
---- a/ircd/m_join.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/m_join.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/m_join.c
+--- a/ircd/m_join.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/m_join.c Thu Jul 25 19:00:52 2013 +0100
@@ -242,8 +242,8 @@
}
/* send accountability notice */
err = 0;
}
-diff -r bba899468eaf ircd/m_jupe.c
---- a/ircd/m_jupe.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/m_jupe.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/m_jupe.c
+--- a/ircd/m_jupe.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/m_jupe.c Thu Jul 25 19:00:52 2013 +0100
@@ -193,7 +193,7 @@
struct Jupe *ajupe;
unsigned int flags = 0;
} else
return need_more_params(sptr, "JUPE");
-diff -r bba899468eaf ircd/m_kill.c
---- a/ircd/m_kill.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/m_kill.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/m_kill.c
+--- a/ircd/m_kill.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/m_kill.c Thu Jul 25 19:00:52 2013 +0100
@@ -127,7 +127,7 @@
*/
sendto_opmask_butone(0, snomask,
inpath, path, msg);
log_write_kill(victim, sptr, inpath, path, msg);
-diff -r bba899468eaf ircd/m_oper.c
---- a/ircd/m_oper.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/m_oper.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/m_oper.c
+--- a/ircd/m_oper.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/m_oper.c Thu Jul 25 19:00:52 2013 +0100
@@ -192,9 +192,9 @@
send_umode_out(cptr, sptr, &old_mode, HasPriv(sptr, PRIV_PROPAGATE), 0);
send_reply(sptr, RPL_YOUREOPER);
log_write(LS_OPER, L_INFO, 0, "OPER (%s) by (%#R)", name, sptr);
}
-diff -r bba899468eaf ircd/m_rehash.c
---- a/ircd/m_rehash.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/m_rehash.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/m_rehash.c
+--- a/ircd/m_rehash.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/m_rehash.c Thu Jul 25 19:00:52 2013 +0100
@@ -121,8 +121,8 @@
}
log_write(LS_SYSTEM, L_INFO, 0, "REHASH From %#C", sptr);
-diff -r bba899468eaf ircd/m_sethost.c
---- a/ircd/m_sethost.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/m_sethost.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/m_sethost.c
+--- a/ircd/m_sethost.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/m_sethost.c Thu Jul 25 19:00:52 2013 +0100
@@ -196,7 +196,7 @@
if (freeform) {
user ? user : "", user ? "@" : "", host);
log_write(LS_SETHOST, L_NOTICE, LOG_NOSNOTICE,
-diff -r bba899468eaf ircd/m_settime.c
---- a/ircd/m_settime.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/m_settime.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/m_settime.c
+--- a/ircd/m_settime.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/m_settime.c Thu Jul 25 19:00:52 2013 +0100
@@ -177,7 +177,7 @@
else /* tell opers about time change */
{
(dt < 0) ? "forwards" : "backwards");
TSoffset -= dt; /* apply time change */
if (IsUser(sptr)) /* let user know what we did */
-diff -r bba899468eaf ircd/s_misc.c
---- a/ircd/s_misc.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/s_misc.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/s_misc.c
+--- a/ircd/s_misc.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/s_misc.c Thu Jul 25 19:00:52 2013 +0100
@@ -172,6 +172,20 @@
return nbuf;
}
cli_name(cli_user(killer)->server));
else if (killer != &me && cli_serv(victim)->up != killer)
sendto_opmask_butone(0, SNO_OLDSNO, "Received SQUIT %s from %s :",
-diff -r bba899468eaf ircd/s_user.c
---- a/ircd/s_user.c Sat Jul 20 14:58:09 2013 +0100
-+++ b/ircd/s_user.c Sat Jul 20 14:58:13 2013 +0100
+diff -r dc2bab3d00a5 ircd/s_user.c
+--- a/ircd/s_user.c Thu Jul 25 18:59:27 2013 +0100
++++ b/ircd/s_user.c Thu Jul 25 19:00:52 2013 +0100
@@ -1491,9 +1491,9 @@
/* notify my operators a user has OPERed on a remote server */
+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (o)",
+ get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_sockhost(sptr));
}
-
if (FlagHas(&setflags, FLAG_OPER) && !IsOper(sptr)) {
-@@ -1518,13 +1517,12 @@
-
+ /* user no longer oper */
+@@ -1518,12 +1517,11 @@
/* notify my operators an operator has deOPERed on the network */
if (MyConnect(sptr)) {
-- sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) as %s",
+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O)",
- cli_name(sptr), cli_user(sptr)->realusername, cli_sockhost(sptr),
- cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>");
-+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O)",
+ get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_sockhost(sptr));
} else {
-- sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) as %s on %s",
+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) on %s",
- cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
- cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>", cli_name(cli_user(sptr)->server));
-+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) on %s",
+ get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
+ cli_name(cli_user(sptr)->server));
}
-
+
client_set_privs(sptr, NULL); /* will clear propagate privilege */
projects / irc / quakenet / snircd-patchqueue.git / blobdiff