Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-09-11 15:58:12 UTC
Modified files:
ChangeLog ircd/gline.c
Log message:
Fix GLINE logging (Bug #750927).
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.458 ircu2.10/ChangeLog:1.459
--- ircu2.10/ChangeLog:1.458 Sat Sep 11 08:51:41 2004
+++ ircu2.10/ChangeLog Sat Sep 11 08:58:01 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.48 ircu2.10/ircd/gline.c:1.49
--- ircu2.10/ircd/gline.c:1.48 Wed Aug 18 21:00:50 2004
+++ ircu2.10/ircd/gline.c Sat Sep 11 08:58:02 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.48 2004/08/19 04:00:50 entrope Exp $
+ * $Id: gline.c,v 1.49 2004/09/11 15:58:02 entrope Exp $
*/
#include "config.h"
@@ -398,9 +398,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 -----------------------
