nickgline: include nick! bit in gline loggin

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

use snomask SNO_GLINE when oper is the source of the GLINE message, else use SNO_AUTO

diff -r 3ef00ebe95e6 ircd/gline.c
--- a/ircd/gline.c	Sat Jul 20 14:58:23 2013 +0100
+++ b/ircd/gline.c	Sat Jul 20 15:02:35 2013 +0100
@@ -231,7 +231,7 @@
         continue;
 
       /* let the ops know about it */
-      sendto_opmask_butone(0, SNO_GLINE, "BADCHAN active for %H", chptr);
+      sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "BADCHAN active for %H", chptr);
 
       for (member=chptr->members;member;member=nmember) {
         nmember=member->next_member;
@@ -286,7 +286,7 @@
         	   gline->gl_reason);
 
         /* let the ops know about it */
-        sendto_opmask_butone(0, SNO_GLINE, "G-line active for %s",
+        sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "G-line active for %s",
                              get_client_name(acptr, SHOW_IP));
 
         /* and get rid of him */
@@ -576,7 +576,7 @@
   /* lifetime is already an absolute timestamp */
 
   /* Inform ops... */
-  sendto_opmask_butone(0, ircd_strncmp(reason, "AUTO", 4) ? SNO_GLINE :
+  sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE :
                        SNO_AUTO, "%s adding %s%s %s for %s%s%s%s%s, expiring at "
                        "%Tu: %s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
@@ -652,7 +652,7 @@
     return 0; /* was active to begin with */
 
   /* Inform ops and log it */
-  sendto_opmask_butone(0, SNO_GLINE, "%s activating global %s for %s%s%s%s%s, "
+  sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "%s activating global %s for %s%s%s%s%s, "
                        "expiring at %Tu: %s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
                          get_client_name_and_opername(sptr) :
@@ -725,7 +725,7 @@
   }
 
   /* Inform ops and log it */
-  sendto_opmask_butone(0, SNO_GLINE, "%s %s %s for %s%s%s%s%s, expiring at %Tu: "
+  sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "%s %s %s for %s%s%s%s%s, expiring at %Tu: "
 		       "%s",
                        (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
                          get_client_name_and_opername(sptr) :
@@ -932,7 +932,7 @@
 
   /* All right, inform ops... */
   non_auto = non_auto || ircd_strncmp(gline->gl_reason, "AUTO", 4);
-  sendto_opmask_butone(0, non_auto ? SNO_GLINE : SNO_AUTO,
+  sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO,
 		       "%s modifying global %s for %s%s%s%s%s:%s",
 		       (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
 		       get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
@@ -980,7 +980,7 @@
   assert(GlineIsLocal(gline));
 
   /* Inform ops and log it */
-  sendto_opmask_butone(0, SNO_GLINE, "%s removing local %s for %s%s%s%s%s",
+  sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "%s removing local %s for %s%s%s%s%s",
 		       (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
 		       get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
 		       GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",