Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2006-05-31 02:43:10 UTC
Modified files:
Tag: u2_10_12_branch
ChangeLog doc/readme.features ircd/m_stats.c
Log message:
Comment updates and /stats response fixups.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.105 ircu2.10/ChangeLog:1.710.2.106
--- ircu2.10/ChangeLog:1.710.2.105 Wed May 24 20:14:12 2006
+++ ircu2.10/ChangeLog Tue May 30 19:43:00 2006
@@ -1,3 +1,13 @@
+2006-05-28 Michael Poole <[EMAIL PROTECTED]>
+
+ * doc/readme.features (MAXBANS): Update default value.
+ (NICKLEN): Likewise.
+ (HIS_STATS_*): Sort alphabetically.
+
+ * ircd/m_stats.c (m_stats): Describe the intention so that there
+ are not further questions about local opers and remote /stats.
+ Fix places that use cptr instead of cptr.
+
2006-05-24 Michael Poole <[EMAIL PROTECTED]>
* ircd/s_auth.c (auth_dns_callback): Be more careful about
Index: ircu2.10/doc/readme.features
diff -u ircu2.10/doc/readme.features:1.19.2.3
ircu2.10/doc/readme.features:1.19.2.4
--- ircu2.10/doc/readme.features:1.19.2.3 Wed Feb 15 19:49:54 2006
+++ ircu2.10/doc/readme.features Tue May 30 19:43:00 2006
@@ -293,7 +293,7 @@
MAXBANS
* Type: integer
- * Default: 30
+ * Default: 45
This is the maximum number of bans a user may set on a given channel.
@@ -492,35 +492,23 @@
As per UnderNet CFV-165, this removes /STATS a from users.
-HIS_STATS_l
- * Type: boolean
- * Default: TRUE
-
-As per UnderNet CFV-165, this removes /STATS l from users.
-
-HIS_STATS_L
- * Type: boolean
- * Default: TRUE
-
-As per UnderNet CFV-165, this removes /STATS L from users.
-
HIS_STATS_c
* Type: boolean
* Default: TRUE
As per UnderNet CFV-165, this removes /STATS c from users.
-HIS_STATS_g
+HIS_STATS_d
* Type: boolean
* Default: TRUE
-As per UnderNet CFV-165, this removes /STATS g from users.
+As per UnderNet CFV-165, this removes /STATS d from users.
-HIS_STATS_k
+HIS_STATS_e
* Type: boolean
* Default: TRUE
-As per UnderNet CFV-165, this removes /STATS k from users.
+As per UnderNet CFV-165, this removes /STATS e from users.
HIS_STATS_f
* Type: boolean
@@ -528,6 +516,12 @@
As per UnderNet CFV-165, this removes /STATS f from users.
+HIS_STATS_g
+ * Type: boolean
+ * Default: TRUE
+
+As per UnderNet CFV-165, this removes /STATS g from users.
+
HIS_STATS_i
* Type: boolean
* Default: TRUE
@@ -546,6 +540,24 @@
As per UnderNet CFV-165, this removes /STATS J from users.
+HIS_STATS_k
+ * Type: boolean
+ * Default: TRUE
+
+As per UnderNet CFV-165, this removes /STATS k from users.
+
+HIS_STATS_l
+ * Type: boolean
+ * Default: TRUE
+
+As per UnderNet CFV-165, this removes /STATS l from users.
+
+HIS_STATS_L
+ * Type: boolean
+ * Default: TRUE
+
+As per UnderNet CFV-165, this removes /STATS L from users.
+
HIS_STATS_M
* Type: boolean
* Default: TRUE
@@ -588,18 +600,6 @@
As per UnderNet CFV-165, this removes /STATS R from users.
-HIS_STATS_d
- * Type: boolean
- * Default: TRUE
-
-As per UnderNet CFV-165, this removes /STATS d from users.
-
-HIS_STATS_e
- * Type: boolean
- * Default: TRUE
-
-As per UnderNet CFV-165, this removes /STATS e from users.
-
HIS_STATS_t
* Type: boolean
* Default: TRUE
@@ -767,7 +767,7 @@
NICKLEN
* Type: integer
- * Default: 9
+ * Default: 12
This is the allowed length of the nickname length. It may not be
larger than the NICKLEN #define, and should usually be the same
Index: ircu2.10/ircd/m_stats.c
diff -u ircu2.10/ircd/m_stats.c:1.31.2.1 ircu2.10/ircd/m_stats.c:1.31.2.2
--- ircu2.10/ircd/m_stats.c:1.31.2.1 Tue Oct 11 18:13:48 2005
+++ ircu2.10/ircd/m_stats.c Tue May 30 19:43:00 2006
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_stats.c,v 1.31.2.1 2005/10/12 01:13:48 entrope Exp $
+ * $Id: m_stats.c,v 1.31.2.2 2006/05/31 02:43:00 entrope Exp $
*/
/*
@@ -121,7 +121,7 @@
const struct StatDesc *sd;
char *param = 0;
- /* If we didn't find a descriptor and this is my client, send them help */
+ /* If we didn't find a descriptor, send them help */
if ((parc < 2) || !(sd = stats_find(parv[1])))
parv[1] = "*", sd = stats_find("*");
@@ -131,15 +131,18 @@
* not privileged (server or an operator), then the STAT_FLAG_OPERONLY
* flag must not be set, and if the STAT_FLAG_OPERFEAT flag is set,
* then the feature given by sd->sd_control must be off.
+ *
+ * This checks cptr rather than sptr so that a local oper may send
+ * /stats queries to other servers.
*/
if (!IsPrivileged(cptr) &&
((sd->sd_flags & STAT_FLAG_OPERONLY) ||
((sd->sd_flags & STAT_FLAG_OPERFEAT) && feature_bool(sd->sd_control))))
- return send_reply(cptr, ERR_NOPRIVILEGES);
+ return send_reply(sptr, ERR_NOPRIVILEGES);
/* Check if they are a local user */
- if ((sd->sd_flags & STAT_FLAG_LOCONLY) && !MyUser(cptr))
- return send_reply(cptr, ERR_NOPRIVILEGES);
+ if ((sd->sd_flags & STAT_FLAG_LOCONLY) && !MyUser(sptr))
+ return send_reply(sptr, ERR_NOPRIVILEGES);
/* Check for extra parameter */
if ((sd->sd_flags & STAT_FLAG_VARPARAM) && parc > 3 && !EmptyString(parv[3]))
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches