Committer  : klmitch
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Branch tags: u2_10_11_07
Commit time: 2004-09-11 15:50:39 UTC

Modified files:
  Tag: u2_10_11_07
     ChangeLog ircd/gline.c

Log message:

Author: Kev <[EMAIL PROTECTED]>
Log message:

Fix GLINE logging (Bug #750927)

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.130.2.15 ircu2.10/ChangeLog:1.290.2.130.2.16
--- ircu2.10/ChangeLog:1.290.2.130.2.15 Sat Sep 11 08:26:47 2004
+++ ircu2.10/ChangeLog  Sat Sep 11 08:50:28 2004
@@ -1,5 +1,7 @@
 2004-09-11  Kevin L Mitchell  <[EMAIL PROTECTED]>
 
+       * ircd/gline.c (gline_add): fix GLINE logging (Bug #750927)
+
        * ircd/channel.c: removing limits shouldn't gobble an argument;
        this was a subtle interaction issue with modebuf...fixed by adding
        MODE_LIMIT to modebuf_flush_int() and short-circuiting
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.38.2.9.2.2 ircu2.10/ircd/gline.c:1.38.2.9.2.3
--- ircu2.10/ircd/gline.c:1.38.2.9.2.2  Fri Jun 18 06:41:44 2004
+++ ircu2.10/ircd/gline.c       Sat Sep 11 08:50:28 2004
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: gline.c,v 1.38.2.9.2.2 2004/06/18 13:41:44 decampos Exp $
+ * $Id: gline.c,v 1.38.2.9.2.3 2004/09/11 15:50:28 klmitch Exp $
  */
 #include "config.h"
 
@@ -442,9 +442,11 @@
 
   /* and log it */
   log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
-           "%#C adding %s %s for %s, expiring at %Tu: %s", sptr,
+           "%#C adding %s %s for %s%s%s, expiring at %Tu: %s", sptr,
            flags & GLINE_LOCAL ? "local" : "global",
-           flags & GLINE_BADCHAN ? "BADCHAN" : "GLINE", userhost,
+           flags & GLINE_BADCHAN ? "BADCHAN" : "GLINE", user,
+           flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : "@",
+           flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : host,
            expire + TSoffset, reason);
 
   /* make the gline */
----------------------- End of diff -----------------------

Reply via email to