Apply coekie's patch for bug #1428190.

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

diff --git a/ChangeLog b/ChangeLog
index 4b577dd5c984ac6800924bd73dc4bcb01fea6177..277698ba2170aa4b0d1309cb2a878d06bb823472 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-14  Wouter Coekarts <wouter@coekaerts.be>
+
+       * ircd/s_err.c (RPL_STATSILINE): Add two %s to the first field.
+
+       * ircd/s_stats.c (stats_configured_links): Use the new %s's to
+       show username masks for I: lines that have them.
+       (stats_access): Likewise.
+
 2006-03-13  Michael Poole <mdpoole@troilus.org>
 
        * ircd/msgq.c (msgq_vmake): Try to clear msgbuf freelist after

diff --git a/ircd/s_err.c b/ircd/s_err.c
index 77f132a5ac30fad551dfc3ae4ec00fe8034af6c9..7bda8797b1d4befe1a3dc71d3402571ce4e41c6b 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -462,7 +462,7 @@ static Numeric replyTable[] = {
 /* 214 */
   { 0 },
 /* 215 */
-  { RPL_STATSILINE, "I %s %d %s%s %d %s", "215" },
+  { RPL_STATSILINE, "I %s%s%s %d %s%s %d %s", "215" },
 /* 216 */
   { RPL_STATSKLINE, "%c %s@%s \"%s\" \"%s\" 0 0", "216" },
 /* 217 */

diff --git a/ircd/s_stats.c b/ircd/s_stats.c
index bfc2d584d8a942520b30644df075ebdd00231f78..1022b0cb6dbac6e6754d4fa76745d9a90d66394a 100644 (file)
--- a/ircd/s_stats.c
+++ b/ircd/s_stats.c
@@ -110,6 +110,7 @@ stats_configured_links(struct Client *sptr, const struct StatDesc* sd,
        send_reply(sptr, RPL_STATSCLINE, name, port, maximum, hub_limit, get_conf_class(tmp));
       else if (tmp->status & CONF_CLIENT)
         send_reply(sptr, RPL_STATSILINE,
+                   (tmp->username ? tmp->username : ""), (tmp->username ? "@" : ""),
                    (tmp->host ? tmp->host : "*"), maximum,
                    (name[0] == ':' ? "0" : ""), (tmp->name ? tmp->name : "*"),
                    port, get_conf_class(tmp));
@@ -184,6 +185,7 @@ stats_access(struct Client *to, const struct StatDesc *sd, char *param)
            || (aconf->name && !match(param, aconf->name))))
     {
       send_reply(to, RPL_STATSILINE,
+                 (aconf->username ? aconf->username : ""), (aconf->username ? "@" : ""), 
                  (aconf->host ? aconf->host : "*"), aconf->maximum,
                  (aconf->name && aconf->name[0] == ':' ? "0":""),
                  aconf->name ? aconf->name : "*",