Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-05-30 13:23:34 UTC
Modified files:
ChangeLog ircd/s_err.c ircd/s_stats.c
Log message:
Reflect local vs global status in output of "/stats o".
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.635 ircu2.10/ChangeLog:1.636
--- ircu2.10/ChangeLog:1.635 Mon May 30 06:16:57 2005
+++ ircu2.10/ChangeLog Mon May 30 06:23:24 2005
@@ -1,3 +1,13 @@
+2005-05-25 Reed Loden <[EMAIL PROTECTED]>
+
+ * ircd/s_err.c (replyTable): Allow for the specification of 'O' or
+ 'o' in RPL_STATSOLINE.
+
+ * ircd/s_stats.c (stats_configured_links): In /stats o/O, display
+ 'O' if either the oper block or the connection class has
+ PRIV_PROPAGATE (global oper) and 'o' if neither has PRIV_PROPAGATE
+ (local oper).
+
2005-05-30 Michael Poole <[EMAIL PROTECTED]>
* ircd/IPcheck.c: Add Debug()s to try to track why the connected
Index: ircu2.10/ircd/s_err.c
diff -u ircu2.10/ircd/s_err.c:1.68 ircu2.10/ircd/s_err.c:1.69
--- ircu2.10/ircd/s_err.c:1.68 Wed May 4 18:36:14 2005
+++ ircu2.10/ircd/s_err.c Mon May 30 06:23:24 2005
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Error handling support.
- * @version $Id: s_err.c,v 1.68 2005/05/05 01:36:14 entrope Exp $
+ * @version $Id: s_err.c,v 1.69 2005/05/30 13:23:24 entrope Exp $
*/
#include "config.h"
@@ -518,7 +518,7 @@
/* 242 */
{ RPL_STATSUPTIME, ":Server Up %d days, %d:%02d:%02d", "242" },
/* 243 */
- { RPL_STATSOLINE, "O [EMAIL PROTECTED] * %s %s", "243" },
+ { RPL_STATSOLINE, "%c [EMAIL PROTECTED] * %s %s", "243" },
/* 244 */
{ 0 },
/* 245 */
Index: ircu2.10/ircd/s_stats.c
diff -u ircu2.10/ircd/s_stats.c:1.40 ircu2.10/ircd/s_stats.c:1.41
--- ircu2.10/ircd/s_stats.c:1.40 Mon May 9 20:43:08 2005
+++ ircu2.10/ircd/s_stats.c Mon May 30 06:23:24 2005
@@ -62,7 +62,7 @@
/** @file
* @brief Report configuration lines and other statistics from this
* server.
- * @version $Id: s_stats.c,v 1.40 2005/05/10 03:43:08 entrope Exp $
+ * @version $Id: s_stats.c,v 1.41 2005/05/30 13:23:24 entrope Exp $
*
* Note: The info is reported in the order the server uses
* it--not reversed as in ircd.conf!
@@ -113,7 +113,12 @@
(name[0] == ':' ? "0" : ""), (tmp->name ? tmp->name : "*"),
port, get_conf_class(tmp));
else if (tmp->status & CONF_OPERATOR)
- send_reply(sptr, RPL_STATSOLINE, username, host, name,
get_conf_class(tmp));
+ send_reply(sptr, RPL_STATSOLINE,
+ ((FlagHas(&tmp->privs_dirty, PRIV_PROPAGATE)
+ && FlagHas(&tmp->privs, PRIV_PROPAGATE))
+ || (FlagHas(&tmp->conn_class->privs_dirty, PRIV_PROPAGATE)
+ && FlagHas(&tmp->conn_class->privs, PRIV_PROPAGATE)))
+ ? 'O' : 'o', username, host, name, get_conf_class(tmp));
}
}
}
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
