Fix GLINE logging (Bug #750927).

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1121 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index be3867cd546c395410b7fb98b14300a9b7949700..80ee62d92e3066f1562f89f98f7a0e02ff8f0d82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-11  Kevin L Mitchell  <klmitch@mit.edu>
 
+       * 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

diff --git a/ircd/gline.c b/ircd/gline.c
index 3fd81c946226004d5b35088cde31f48bb548f521..0fea0ce109a462eb90d8b5e725ed1198dcb50527 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -398,9 +398,11 @@ gline_add(struct Client *cptr, struct Client *sptr, char *userhost,
 
   /* 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 */