Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2006-03-14 14:57:01 UTC
Modified files:
Tag: u2_10_12_branch
ircd/s_stats.c ircd/s_err.c ChangeLog
Log message:
Apply coekie's patch for bug #1428190.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.78 ircu2.10/ChangeLog:1.710.2.79
--- ircu2.10/ChangeLog:1.710.2.78 Mon Mar 13 19:56:58 2006
+++ ircu2.10/ChangeLog Tue Mar 14 06:56:51 2006
@@ -1,3 +1,11 @@
+2006-03-14 Wouter Coekarts <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* ircd/msgq.c (msgq_vmake): Try to clear msgbuf freelist after
Index: ircu2.10/ircd/s_err.c
diff -u ircu2.10/ircd/s_err.c:1.72.2.1 ircu2.10/ircd/s_err.c:1.72.2.2
--- ircu2.10/ircd/s_err.c:1.72.2.1 Mon Oct 31 15:16:56 2005
+++ ircu2.10/ircd/s_err.c Tue Mar 14 06:56:50 2006
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Error handling support.
- * @version $Id: s_err.c,v 1.72.2.1 2005/10/31 23:16:56 entrope Exp $
+ * @version $Id: s_err.c,v 1.72.2.2 2006/03/14 14:56:50 entrope Exp $
*/
#include "config.h"
@@ -462,7 +462,7 @@
/* 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 [EMAIL PROTECTED] \"%s\" \"%s\" 0 0", "216" },
/* 217 */
Index: ircu2.10/ircd/s_stats.c
diff -u ircu2.10/ircd/s_stats.c:1.44.2.3 ircu2.10/ircd/s_stats.c:1.44.2.4
--- ircu2.10/ircd/s_stats.c:1.44.2.3 Wed Feb 15 19:49:54 2006
+++ ircu2.10/ircd/s_stats.c Tue Mar 14 06:56:50 2006
@@ -63,7 +63,7 @@
/** @file
* @brief Report configuration lines and other statistics from this
* server.
- * @version $Id: s_stats.c,v 1.44.2.3 2006/02/16 03:49:54 entrope Exp $
+ * @version $Id: s_stats.c,v 1.44.2.4 2006/03/14 14:56:50 entrope Exp $
*
* Note: The info is reported in the order the server uses
* it--not reversed as in ircd.conf!
@@ -110,6 +110,7 @@
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 @@
|| (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 : "*",
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
