[irc/quakenet/snircd-patchqueue.git] / opername.patch

Add opername to snomask, remote connect wallops, and as prefix to server jupes

in form of nick(opername)
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 7f6ed442e24f include/client.h
--- a/include/client.h	Tue Mar 23 23:58:24 2010 +0100
+++ b/include/client.h	Wed Mar 24 00:18:22 2010 +0100
@@ -810,6 +810,7 @@
 #define IPV6USERBITS 64
 
 extern const char* get_client_name(const struct Client* sptr, int showip);
+extern const char* get_client_name_and_opername(const struct Client* sptr);
 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 7f6ed442e24f ircd/channel.c
--- a/ircd/channel.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/channel.c	Wed Mar 24 00:18:22 2010 +0100
@@ -1905,8 +1905,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 "
 			   "[%Tu]",
-			   cli_name(feature_bool(FEAT_HIS_SNOTICES) ?
-                                    mbuf->mb_source : app_source),
+			   feature_bool(FEAT_HIS_SNOTICES) ?
+                           get_client_name_and_opername(mbuf->mb_source) : cli_name(app_source),
 			   mbuf->mb_channel->chname,
 			   rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
 			   addbuf, remstr, addstr,
diff -r 7f6ed442e24f ircd/gline.c
--- a/ircd/gline.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/gline.c	Wed Mar 24 00:18:22 2010 +0100
@@ -567,7 +567,7 @@
                        SNO_AUTO, "%s adding %s%s %s for %s%s%s%s%s, expiring at "
                        "%Tu: %s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-                         cli_name(sptr) :
+                         get_client_name_and_opername(sptr) :
                          cli_name((cli_user(sptr))->server),
                        (flags & GLINE_ACTIVE) ? "" : "deactivated ",
 		       (flags & GLINE_LOCAL) ? "local" : "global",
@@ -642,7 +642,7 @@
   sendto_opmask_butone(0, SNO_GLINE, "%s activating global %s for %s%s%s%s%s, "
                        "expiring at %Tu: %s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-                         cli_name(sptr) :
+                         get_client_name_and_opername(sptr) :
                          cli_name((cli_user(sptr))->server),
                        GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
                        GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : gline->gl_nick,
@@ -715,7 +715,7 @@
   sendto_opmask_butone(0, SNO_GLINE, "%s %s %s for %s%s%s%s%s, expiring at %Tu: "
 		       "%s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-                         cli_name(sptr) :
+                         get_client_name_and_opername(sptr) :
                          cli_name((cli_user(sptr))->server),
 		       msg, GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
                        GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : gline->gl_nick,
@@ -919,7 +919,7 @@
   /* All right, inform ops... */
   sendto_opmask_butone(0, SNO_GLINE, "%s modifying global %s for %s%s%s%s%s:%s",
 		       (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-		       cli_name(sptr) : cli_name((cli_user(sptr))->server),
+		       get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
 		       GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
                        GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : gline->gl_nick,
                        GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : "!",
@@ -966,7 +966,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)) ?
-		       cli_name(sptr) : cli_name((cli_user(sptr))->server),
+		       get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
 		       GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
                        GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : gline->gl_nick,
                        GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : "!",
diff -r 7f6ed442e24f ircd/jupe.c
--- a/ircd/jupe.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/jupe.c	Wed Mar 24 00:18:22 2010 +0100
@@ -156,7 +156,7 @@
   sendto_opmask_butone(0, SNO_NETWORK, "%s adding %sJUPE for %s, expiring at "
                        "%Tu: %s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-                         cli_name(sptr) :
+                         get_client_name_and_opername(sptr) :
                          cli_name((cli_user(sptr))->server),
 		       flags & JUPE_LOCAL ? "local " : "", server,
 		       expire + TSoffset, reason);
@@ -211,7 +211,7 @@
   sendto_opmask_butone(0, SNO_NETWORK, "%s activating JUPE for %s, expiring "
 		       "at %Tu: %s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-                         cli_name(sptr) :
+                         get_client_name_and_opername(sptr) :
                          cli_name((cli_user(sptr))->server),
 		       jupe->ju_server, jupe->ju_expire + TSoffset,
 		       jupe->ju_reason);
@@ -264,7 +264,7 @@
   sendto_opmask_butone(0, SNO_NETWORK, "%s %s JUPE for %s, expiring at %Tu: "
 		       "%s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-                         cli_name(sptr) :
+                         get_client_name_and_opername(sptr) :
                          cli_name((cli_user(sptr))->server),
 		       JupeIsLocal(jupe) ? "removing local" : "deactivating",
 		       jupe->ju_server, jupe->ju_expire + TSoffset,
diff -r 7f6ed442e24f ircd/m_connect.c
--- a/ircd/m_connect.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/m_connect.c	Wed Mar 24 00:18:22 2010 +0100
@@ -197,7 +197,7 @@
   sendwallto_group_butone(&me, WALL_WALLOPS, 0,
                        "Remote CONNECT %s %s from %s", aconf->name,
 			parv[2] ? parv[2] : "",
-			get_client_name(sptr, HIDE_IP));
+			get_client_name_and_opername(sptr));
   log_write(LS_NETWORK, L_INFO, 0, "CONNECT From %C : %s %s", sptr, aconf->name,
 	    parv[2] ? parv[2] : "");
 
diff -r 7f6ed442e24f ircd/m_join.c
--- a/ircd/m_join.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/m_join.c	Wed Mar 24 00:18:22 2010 +0100
@@ -242,8 +242,8 @@
         }
         /* send accountability notice */
         if (err)
-          sendto_opmask_butone(0, SNO_HACK4, "OPER JOIN: %C JOIN %H "
-                               "(overriding +%c)", sptr, chptr, err);
+          sendto_opmask_butone(0, SNO_HACK4, "OPER JOIN: %s JOIN %H "
+                               "(overriding +%c)", get_client_name_and_opername(sptr), chptr, err);
         err = 0;
       }
 
diff -r 7f6ed442e24f ircd/m_jupe.c
--- a/ircd/m_jupe.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/m_jupe.c	Wed Mar 24 00:18:22 2010 +0100
@@ -193,7 +193,7 @@
   struct Jupe *ajupe;
   unsigned int flags = 0;
   time_t expire_off;
-  char *server = parv[1], *target = 0, *reason;
+  char *server = parv[1], *target = 0, reason[BUFSIZE];
 
   if (parc < 2) {
     if (!HasPriv(sptr, PRIV_ROUTEINFO))
@@ -214,12 +214,12 @@
 
   if (parc == 4) {
     expire_off = atoi(parv[2]);
-    reason = parv[3];
+    ircd_snprintf(0, reason, sizeof(reason), "%s: %s", cli_user(sptr)->opername, parv[3]);
     flags |= JUPE_LOCAL;
   } else if (parc > 4) {
     target = parv[2];
     expire_off = atoi(parv[3]);
-    reason = parv[4];
+    ircd_snprintf(0, reason, sizeof(reason), "%s: %s", cli_user(sptr)->opername, parv[4]);
   } else
     return need_more_params(sptr, "JUPE");
 
diff -r 7f6ed442e24f ircd/m_kill.c
--- a/ircd/m_kill.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/m_kill.c	Wed Mar 24 00:18:22 2010 +0100
@@ -127,7 +127,7 @@
    */
   sendto_opmask_butone(0, snomask,
                        "Received KILL message for %s from %s Path: %s!%s %s",
-                       get_client_name(victim, SHOW_IP), cli_name(sptr),
+                       get_client_name(victim, SHOW_IP), get_client_name_and_opername(sptr),
                        inpath, path, msg);
   log_write_kill(victim, sptr, inpath, path, msg);
 
diff -r 7f6ed442e24f ircd/m_oper.c
--- a/ircd/m_oper.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/m_oper.c	Wed Mar 24 00:18:22 2010 +0100
@@ -192,9 +192,9 @@
     send_umode_out(cptr, sptr, &old_mode, HasPriv(sptr, PRIV_PROPAGATE));
     send_reply(sptr, RPL_YOUREOPER);
 
-    sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is now operator (%c) as %s",
-			 parv[0], cli_user(sptr)->realusername, cli_sockhost(sptr),
-			 IsOper(sptr) ? 'O' : 'o', cli_user(sptr)->opername);
+    sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is now operator (%c)",
+			 get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_sockhost(sptr),
+			 IsOper(sptr) ? 'O' : 'o');
 
     log_write(LS_OPER, L_INFO, 0, "OPER (%s) by (%#R)", name, sptr);
   }
diff -r 7f6ed442e24f ircd/m_rehash.c
--- a/ircd/m_rehash.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/m_rehash.c	Wed Mar 24 00:18:22 2010 +0100
@@ -121,8 +121,8 @@
   }
 
   send_reply(sptr, RPL_REHASHING, configfile);
-  sendto_opmask_butone(0, SNO_OLDSNO, "%C is rehashing Server config file",
-		       sptr);
+  sendto_opmask_butone(0, SNO_OLDSNO, "%s is rehashing Server config file",
+		       get_client_name_and_opername(sptr));
 
   log_write(LS_SYSTEM, L_INFO, 0, "REHASH From %#C", sptr);
 
diff -r 7f6ed442e24f ircd/m_settime.c
--- a/ircd/m_settime.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/m_settime.c	Wed Mar 24 00:18:22 2010 +0100
@@ -177,7 +177,7 @@
   else /* tell opers about time change */
   {
     sendto_opmask_butone(0, SNO_OLDSNO, "SETTIME from %s, clock is set %ld "
-			 "seconds %s", cli_name(sptr), (dt < 0) ? -dt : dt,
+			 "seconds %s", get_client_name_and_opername(sptr), (dt < 0) ? -dt : dt,
 			 (dt < 0) ? "forwards" : "backwards");
     /* Apply time change... */
     TSoffset -= dt;
@@ -252,7 +252,7 @@
   else /* tell opers about time change */
   {
     sendto_opmask_butone(0, SNO_OLDSNO, "SETTIME from %s, clock is set %ld "
-			 "seconds %s", cli_name(sptr), (dt < 0) ? -dt : dt,
+			 "seconds %s", get_client_name_and_opername(sptr), (dt < 0) ? -dt : dt,
 			 (dt < 0) ? "forwards" : "backwards");
     TSoffset -= dt; /* apply time change */
     if (IsUser(sptr)) /* let user know what we did */
diff -r 7f6ed442e24f ircd/s_misc.c
--- a/ircd/s_misc.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/s_misc.c	Wed Mar 24 00:18:22 2010 +0100
@@ -172,6 +172,20 @@
   return nbuf;
 }
 
+/** Return the name of the client and the opername for accountability purposes
+ * in snomask and other places.
+ * @param sptr Client to operate on.
+ * @return Either cli_name(\a sptr) or a static buffer.
+ */
+const char* get_client_name_and_opername(const struct Client* sptr) {
+  static char nbuf[NICKLEN + 1 + ACCOUNTLEN + 2];
+
+  if (!IsUser(sptr) || !cli_user(sptr)->opername)
+    return cli_name(sptr);
+  ircd_snprintf(0, nbuf, sizeof(nbuf), "%s(%s)", cli_name(sptr), cli_user(sptr)->opername);
+  return nbuf;
+}
+
 /**
  * Exit one client, local or remote. Assuming for local client that
  * all dependents already have been removed, and socket is closed.
@@ -474,7 +488,7 @@
 			   (cli_user(killer)->server == victim ||
 			    cli_user(killer)->server == cli_serv(victim)->up) ?
 			   "Local" : "Remote",
-			   get_client_name(killer, HIDE_IP),
+			   get_client_name_and_opername(killer),
 			   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 7f6ed442e24f ircd/s_user.c
--- a/ircd/s_user.c	Tue Mar 23 23:58:24 2010 +0100
+++ b/ircd/s_user.c	Wed Mar 24 00:18:22 2010 +0100
@@ -1324,9 +1324,8 @@
             cli_handler(sptr) = CLIENT_HANDLER;
             
             /* notify my operators a local operator has deOPERed - wiebe */
-            sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (o) as %s",
-            cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
-            cli_user(sptr)->opername);
+            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_user(sptr)->realhost);
             
           }
         }
@@ -1528,9 +1527,9 @@
 
       /* notify my operators a user has OPERed on a remote server - wiebe */
       if (!MyConnect(sptr)) {
-         sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is now operator (O) as %s 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 now operator (O) on %s",
+         get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
+         cli_name(cli_user(sptr)->server));
       }
 			 
     }
@@ -1545,13 +1544,12 @@
       
       /* notify my operators an operator has deOPERed on the network - wiebe */
       if (MyConnect(sptr)) {
-        sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) as %s",
-        cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
-        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_user(sptr)->realhost);
       } else {
-        sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) as %s 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 */
Commit	Line	Data
194ecdc4	1	Add opername to snomask, remote connect wallops, and as prefix to server jupes
7efbed3b	2
	3	in form of nick(opername)
	4	new function get_client_name_and_opername() add in s_misc.c
	5	mirrored after get_client_name() which can return either nick/server or nick[ident@ip]
88a737db	6
8a8d0320	7	diff -r 7f6ed442e24f include/client.h
	8	--- a/include/client.h Tue Mar 23 23:58:24 2010 +0100
	9	+++ b/include/client.h Wed Mar 24 00:18:22 2010 +0100
c7910156	10	@@ -810,6 +810,7 @@
88a737db	11	#define IPV6USERBITS 64
	12
	13	extern const char* get_client_name(const struct Client* sptr, int showip);
	14	+extern const char* get_client_name_and_opername(const struct Client* sptr);
	15	extern const char* client_get_default_umode(const struct Client* sptr);
	16	extern int client_get_ping(const struct Client* local_client);
	17	extern void client_drop_sendq(struct Connection* con);
8a8d0320	18	diff -r 7f6ed442e24f ircd/channel.c
	19	--- a/ircd/channel.c Tue Mar 23 23:58:24 2010 +0100
	20	+++ b/ircd/channel.c Wed Mar 24 00:18:22 2010 +0100
18be00cb	21	@@ -1905,8 +1905,8 @@
88a737db	22	if (mbuf->mb_dest & MODEBUF_DEST_HACK4)
	23	sendto_opmask_butone(0, SNO_HACK4, "HACK(4): %s MODE %s %s%s%s%s%s%s "
	24	"[%Tu]",
	25	- cli_name(feature_bool(FEAT_HIS_SNOTICES) ?
	26	- mbuf->mb_source : app_source),
	27	+ feature_bool(FEAT_HIS_SNOTICES) ?
	28	+ get_client_name_and_opername(mbuf->mb_source) : cli_name(app_source),
	29	mbuf->mb_channel->chname,
	30	rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
	31	addbuf, remstr, addstr,
8a8d0320	32	diff -r 7f6ed442e24f ircd/gline.c
	33	--- a/ircd/gline.c Tue Mar 23 23:58:24 2010 +0100
	34	+++ b/ircd/gline.c Wed Mar 24 00:18:22 2010 +0100
18be00cb	35	@@ -567,7 +567,7 @@
c7910156	36	SNO_AUTO, "%s adding %s%s %s for %s%s%s%s%s, expiring at "
c7910156	37	"%Tu: %s",
88a737db	38	(feature_bool(FEAT_HIS_SNOTICES) \|\| IsServer(sptr)) ?
	39	- cli_name(sptr) :
	40	+ get_client_name_and_opername(sptr) :
	41	cli_name((cli_user(sptr))->server),
82957caf	42	(flags & GLINE_ACTIVE) ? "" : "deactivated ",
88a737db	43	(flags & GLINE_LOCAL) ? "local" : "global",
18be00cb	44	@@ -642,7 +642,7 @@
c7910156	45	sendto_opmask_butone(0, SNO_GLINE, "%s activating global %s for %s%s%s%s%s, "
88a737db	46	"expiring at %Tu: %s",
	47	(feature_bool(FEAT_HIS_SNOTICES) \|\| IsServer(sptr)) ?
	48	- cli_name(sptr) :
	49	+ get_client_name_and_opername(sptr) :
	50	cli_name((cli_user(sptr))->server),
	51	GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
	52	GlineIsBadChan(gline)\|GlineIsRealName(gline) ? "" : gline->gl_nick,
18be00cb	53	@@ -715,7 +715,7 @@
c7910156	54	sendto_opmask_butone(0, SNO_GLINE, "%s %s %s for %s%s%s%s%s, expiring at %Tu: "
c7910156	55	"%s",
88a737db	56	(feature_bool(FEAT_HIS_SNOTICES) \|\| IsServer(sptr)) ?
	57	- cli_name(sptr) :
	58	+ get_client_name_and_opername(sptr) :
	59	cli_name((cli_user(sptr))->server),
	60	msg, GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
	61	GlineIsBadChan(gline)\|GlineIsRealName(gline) ? "" : gline->gl_nick,
18be00cb	62	@@ -919,7 +919,7 @@
c7910156	63	/* All right, inform ops... */
c7910156	64	sendto_opmask_butone(0, SNO_GLINE, "%s modifying global %s for %s%s%s%s%s:%s",
88a737db	65	(feature_bool(FEAT_HIS_SNOTICES) \|\| IsServer(sptr)) ?
	66	- cli_name(sptr) : cli_name((cli_user(sptr))->server),
	67	+ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
	68	GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
	69	GlineIsBadChan(gline)\|GlineIsRealName(gline) ? "" : gline->gl_nick,
	70	GlineIsBadChan(gline)\|GlineIsRealName(gline) ? "" : "!",
18be00cb	71	@@ -966,7 +966,7 @@
c7910156	72	/* Inform ops and log it */
c7910156	73	sendto_opmask_butone(0, SNO_GLINE, "%s removing local %s for %s%s%s%s%s",
88a737db	74	(feature_bool(FEAT_HIS_SNOTICES) \|\| IsServer(sptr)) ?
	75	- cli_name(sptr) : cli_name((cli_user(sptr))->server),
	76	+ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
	77	GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
	78	GlineIsBadChan(gline)\|GlineIsRealName(gline) ? "" : gline->gl_nick,
	79	GlineIsBadChan(gline)\|GlineIsRealName(gline) ? "" : "!",
8a8d0320	80	diff -r 7f6ed442e24f ircd/jupe.c
	81	--- a/ircd/jupe.c Tue Mar 23 23:58:24 2010 +0100
	82	+++ b/ircd/jupe.c Wed Mar 24 00:18:22 2010 +0100
12e82c05	83	@@ -156,7 +156,7 @@
88a737db	84	sendto_opmask_butone(0, SNO_NETWORK, "%s adding %sJUPE for %s, expiring at "
	85	"%Tu: %s",
	86	(feature_bool(FEAT_HIS_SNOTICES) \|\| IsServer(sptr)) ?
	87	- cli_name(sptr) :
	88	+ get_client_name_and_opername(sptr) :
	89	cli_name((cli_user(sptr))->server),
	90	flags & JUPE_LOCAL ? "local " : "", server,
	91	expire + TSoffset, reason);
c7910156	92	@@ -211,7 +211,7 @@
88a737db	93	sendto_opmask_butone(0, SNO_NETWORK, "%s activating JUPE for %s, expiring "
	94	"at %Tu: %s",
	95	(feature_bool(FEAT_HIS_SNOTICES) \|\| IsServer(sptr)) ?
	96	- cli_name(sptr) :
	97	+ get_client_name_and_opername(sptr) :
	98	cli_name((cli_user(sptr))->server),
	99	jupe->ju_server, jupe->ju_expire + TSoffset,
	100	jupe->ju_reason);
c7910156	101	@@ -264,7 +264,7 @@
88a737db	102	sendto_opmask_butone(0, SNO_NETWORK, "%s %s JUPE for %s, expiring at %Tu: "
	103	"%s",
	104	(feature_bool(FEAT_HIS_SNOTICES) \|\| IsServer(sptr)) ?
	105	- cli_name(sptr) :
	106	+ get_client_name_and_opername(sptr) :
	107	cli_name((cli_user(sptr))->server),
	108	JupeIsLocal(jupe) ? "removing local" : "deactivating",
	109	jupe->ju_server, jupe->ju_expire + TSoffset,
8a8d0320	110	diff -r 7f6ed442e24f ircd/m_connect.c
	111	--- a/ircd/m_connect.c Tue Mar 23 23:58:24 2010 +0100
	112	+++ b/ircd/m_connect.c Wed Mar 24 00:18:22 2010 +0100
12e82c05	113	@@ -197,7 +197,7 @@
88a737db	114	sendwallto_group_butone(&me, WALL_WALLOPS, 0,
	115	"Remote CONNECT %s %s from %s", aconf->name,
	116	parv[2] ? parv[2] : "",
	117	- get_client_name(sptr, HIDE_IP));
88a737db	118	+ get_client_name_and_opername(sptr));
12e82c05	119	log_write(LS_NETWORK, L_INFO, 0, "CONNECT From %C : %s %s", sptr, aconf->name,
88a737db	120	parv[2] ? parv[2] : "");
88a737db	121
8a8d0320	122	diff -r 7f6ed442e24f ircd/m_join.c
	123	--- a/ircd/m_join.c Tue Mar 23 23:58:24 2010 +0100
	124	+++ b/ircd/m_join.c Wed Mar 24 00:18:22 2010 +0100
88a737db	125	@@ -242,8 +242,8 @@
	126	}
	127	/* send accountability notice */
	128	if (err)
	129	- sendto_opmask_butone(0, SNO_HACK4, "OPER JOIN: %C JOIN %H "
	130	- "(overriding +%c)", sptr, chptr, err);
	131	+ sendto_opmask_butone(0, SNO_HACK4, "OPER JOIN: %s JOIN %H "
	132	+ "(overriding +%c)", get_client_name_and_opername(sptr), chptr, err);
	133	err = 0;
	134	}
	135
8a8d0320	136	diff -r 7f6ed442e24f ircd/m_jupe.c
	137	--- a/ircd/m_jupe.c Tue Mar 23 23:58:24 2010 +0100
	138	+++ b/ircd/m_jupe.c Wed Mar 24 00:18:22 2010 +0100
18be00cb	139	@@ -193,7 +193,7 @@
	140	struct Jupe *ajupe;
	141	unsigned int flags = 0;
	142	time_t expire_off;
	143	- char server = parv[1], target = 0, *reason;
8a8d0320	144	+ char server = parv[1], target = 0, reason[BUFSIZE];
18be00cb	145
	146	if (parc < 2) {
	147	if (!HasPriv(sptr, PRIV_ROUTEINFO))
	148	@@ -214,12 +214,12 @@
	149
	150	if (parc == 4) {
	151	expire_off = atoi(parv[2]);
	152	- reason = parv[3];
	153	+ ircd_snprintf(0, reason, sizeof(reason), "%s: %s", cli_user(sptr)->opername, parv[3]);
	154	flags \|= JUPE_LOCAL;
	155	} else if (parc > 4) {
	156	target = parv[2];
	157	expire_off = atoi(parv[3]);
	158	- reason = parv[4];
	159	+ ircd_snprintf(0, reason, sizeof(reason), "%s: %s", cli_user(sptr)->opername, parv[4]);
	160	} else
	161	return need_more_params(sptr, "JUPE");
	162
8a8d0320	163	diff -r 7f6ed442e24f ircd/m_kill.c
	164	--- a/ircd/m_kill.c Tue Mar 23 23:58:24 2010 +0100
	165	+++ b/ircd/m_kill.c Wed Mar 24 00:18:22 2010 +0100
88a737db	166	@@ -127,7 +127,7 @@
	167	*/
	168	sendto_opmask_butone(0, snomask,
	169	"Received KILL message for %s from %s Path: %s!%s %s",
	170	- get_client_name(victim, SHOW_IP), cli_name(sptr),
	171	+ get_client_name(victim, SHOW_IP), get_client_name_and_opername(sptr),
	172	inpath, path, msg);
	173	log_write_kill(victim, sptr, inpath, path, msg);
	174
8a8d0320	175	diff -r 7f6ed442e24f ircd/m_oper.c
	176	--- a/ircd/m_oper.c Tue Mar 23 23:58:24 2010 +0100
	177	+++ b/ircd/m_oper.c Wed Mar 24 00:18:22 2010 +0100
c7910156	178	@@ -192,9 +192,9 @@
	179	send_umode_out(cptr, sptr, &old_mode, HasPriv(sptr, PRIV_PROPAGATE));
	180	send_reply(sptr, RPL_YOUREOPER);
	181
	182	- sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is now operator (%c) as %s",
	183	- parv[0], cli_user(sptr)->realusername, cli_sockhost(sptr),
	184	- IsOper(sptr) ? 'O' : 'o', cli_user(sptr)->opername);
	185	+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is now operator (%c)",
	186	+ get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_sockhost(sptr),
	187	+ IsOper(sptr) ? 'O' : 'o');
	188
	189	log_write(LS_OPER, L_INFO, 0, "OPER (%s) by (%#R)", name, sptr);
	190	}
8a8d0320	191	diff -r 7f6ed442e24f ircd/m_rehash.c
	192	--- a/ircd/m_rehash.c Tue Mar 23 23:58:24 2010 +0100
	193	+++ b/ircd/m_rehash.c Wed Mar 24 00:18:22 2010 +0100
12e82c05	194	@@ -121,8 +121,8 @@
88a737db	195	}
	196
	197	send_reply(sptr, RPL_REHASHING, configfile);
	198	- sendto_opmask_butone(0, SNO_OLDSNO, "%C is rehashing Server config file",
	199	- sptr);
	200	+ sendto_opmask_butone(0, SNO_OLDSNO, "%s is rehashing Server config file",
	201	+ get_client_name_and_opername(sptr));
	202
12e82c05	203	log_write(LS_SYSTEM, L_INFO, 0, "REHASH From %#C", sptr);
88a737db	204
8a8d0320	205	diff -r 7f6ed442e24f ircd/m_settime.c
	206	--- a/ircd/m_settime.c Tue Mar 23 23:58:24 2010 +0100
	207	+++ b/ircd/m_settime.c Wed Mar 24 00:18:22 2010 +0100
88a737db	208	@@ -177,7 +177,7 @@
	209	else /* tell opers about time change */
	210	{
	211	sendto_opmask_butone(0, SNO_OLDSNO, "SETTIME from %s, clock is set %ld "
	212	- "seconds %s", cli_name(sptr), (dt < 0) ? -dt : dt,
	213	+ "seconds %s", get_client_name_and_opername(sptr), (dt < 0) ? -dt : dt,
	214	(dt < 0) ? "forwards" : "backwards");
	215	/* Apply time change... */
	216	TSoffset -= dt;
	217	@@ -252,7 +252,7 @@
	218	else /* tell opers about time change */
	219	{
	220	sendto_opmask_butone(0, SNO_OLDSNO, "SETTIME from %s, clock is set %ld "
	221	- "seconds %s", cli_name(sptr), (dt < 0) ? -dt : dt,
	222	+ "seconds %s", get_client_name_and_opername(sptr), (dt < 0) ? -dt : dt,
	223	(dt < 0) ? "forwards" : "backwards");
	224	TSoffset -= dt; /* apply time change */
	225	if (IsUser(sptr)) /* let user know what we did */
8a8d0320	226	diff -r 7f6ed442e24f ircd/s_misc.c
	227	--- a/ircd/s_misc.c Tue Mar 23 23:58:24 2010 +0100
	228	+++ b/ircd/s_misc.c Wed Mar 24 00:18:22 2010 +0100
82957caf	229	@@ -172,6 +172,20 @@
	230	return nbuf;
	231	}
	232
88a737db	233	+/** Return the name of the client and the opername for accountability purposes
	234	+ * in snomask and other places.
	235	+ * @param sptr Client to operate on.
	236	+ * @return Either cli_name(\a sptr) or a static buffer.
	237	+ */
	238	+const char* get_client_name_and_opername(const struct Client* sptr) {
	239	+ static char nbuf[NICKLEN + 1 + ACCOUNTLEN + 2];
	240	+
	241	+ if (!IsUser(sptr) \|\| !cli_user(sptr)->opername)
	242	+ return cli_name(sptr);
	243	+ ircd_snprintf(0, nbuf, sizeof(nbuf), "%s(%s)", cli_name(sptr), cli_user(sptr)->opername);
82957caf	244	+ return nbuf;
	245	+}
	246	+
	247	/**
	248	* Exit one client, local or remote. Assuming for local client that
	249	* all dependents already have been removed, and socket is closed.
88a737db	250	@@ -474,7 +488,7 @@
	251	(cli_user(killer)->server == victim \|\|
	252	cli_user(killer)->server == cli_serv(victim)->up) ?
	253	"Local" : "Remote",
	254	- get_client_name(killer, HIDE_IP),
	255	+ get_client_name_and_opername(killer),
	256	cli_name(cli_user(killer)->server));
	257	else if (killer != &me && cli_serv(victim)->up != killer)
	258	sendto_opmask_butone(0, SNO_OLDSNO, "Received SQUIT %s from %s :",
8a8d0320	259	diff -r 7f6ed442e24f ircd/s_user.c
	260	--- a/ircd/s_user.c Tue Mar 23 23:58:24 2010 +0100
	261	+++ b/ircd/s_user.c Wed Mar 24 00:18:22 2010 +0100
18be00cb	262	@@ -1324,9 +1324,8 @@
c7910156	263	cli_handler(sptr) = CLIENT_HANDLER;
	264
	265	/* notify my operators a local operator has deOPERed - wiebe */
	266	- sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (o) as %s",
	267	- cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
	268	- cli_user(sptr)->opername);
	269	+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (o)",
	270	+ get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost);
	271
	272	}
	273	}
18be00cb	274	@@ -1528,9 +1527,9 @@
c7910156	275
	276	/* notify my operators a user has OPERed on a remote server - wiebe */
	277	if (!MyConnect(sptr)) {
	278	- sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is now operator (O) as %s on %s",
	279	- cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
	280	- cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>", cli_name(cli_user(sptr)->server));
	281	+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is now operator (O) on %s",
	282	+ get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
	283	+ cli_name(cli_user(sptr)->server));
	284	}
	285
	286	}
18be00cb	287	@@ -1545,13 +1544,12 @@
c7910156	288
	289	/* notify my operators an operator has deOPERed on the network - wiebe */
	290	if (MyConnect(sptr)) {
	291	- sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) as %s",
	292	- cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
	293	- cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>");
	294	+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O)",
	295	+ get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost);
	296	} else {
	297	- sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) as %s on %s",
	298	- cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
	299	- cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>", cli_name(cli_user(sptr)->server));
	300	+ sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) on %s",
	301	+ get_client_name_and_opername(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
	302	+ cli_name(cli_user(sptr)->server));
	303	}
	304
	305	client_set_privs(sptr, NULL); /* will clear propagate privilege */