Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-08-26 02:36:44 UTC
Modified files:
ChangeLog ircd/channel.c ircd/class.c
Log message:
Silence channel manager once Apass set; fix /stats y links count.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.680 ircu2.10/ChangeLog:1.681
--- ircu2.10/ChangeLog:1.680 Thu Aug 25 11:09:03 2005
+++ ircu2.10/ChangeLog Thu Aug 25 19:36:33 2005
@@ -1,5 +1,14 @@
2005-08-25 Michael Poole <[EMAIL PROTECTED]>
+ * ircd/channel.c (member_can_send_to_channel): At coekie's
+ suggestion, disallow channel manager talking after Apass is set,
+ so they set and use Upass sooner.
+
+ * ircd/class.c (report_classes): Return links count plus one to
+ match old output.
+
+2005-08-25 Michael Poole <[EMAIL PROTECTED]>
+
* ircd/channel.c (mode_parse): Accept +A/+U from servers
regardless of FEAT_OPLEVELS.
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.144 ircu2.10/ircd/channel.c:1.145
--- ircu2.10/ircd/channel.c:1.144 Thu Aug 25 11:09:04 2005
+++ ircu2.10/ircd/channel.c Thu Aug 25 19:36:33 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Channel management and maintenance
- * @version $Id: channel.c,v 1.144 2005/08/25 18:09:04 entrope Exp $
+ * @version $Id: channel.c,v 1.145 2005/08/26 02:36:33 entrope Exp $
*/
#include "config.h"
@@ -657,14 +657,15 @@
assert(0 != member);
/* Discourage using the Apass to get op. They should use the upass. */
- if (IsChannelManager(member) && *member->channel->mode.upass)
+ if (IsChannelManager(member) && member->channel->mode.apass[0])
return 0;
if (IsVoicedOrOpped(member))
return 1;
+
/*
* If it's moderated, and you aren't a privileged user, you can't
- * speak.
+ * speak.
*/
if (member->channel->mode.mode & MODE_MODERATED)
return 0;
Index: ircu2.10/ircd/class.c
diff -u ircu2.10/ircd/class.c:1.31 ircu2.10/ircd/class.c:1.32
--- ircu2.10/ircd/class.c:1.31 Mon May 30 14:07:33 2005
+++ ircu2.10/ircd/class.c Thu Aug 25 19:36:33 2005
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Implementation of connection class handling functions.
- * @version $Id: class.c,v 1.31 2005/05/30 21:07:33 entrope Exp $
+ * @version $Id: class.c,v 1.32 2005/08/26 02:36:33 entrope Exp $
*/
#include "config.h"
@@ -257,7 +257,7 @@
for (cltmp = connClassList; cltmp; cltmp = cltmp->next)
send_reply(sptr, RPL_STATSYLINE, 'Y', ConClass(cltmp), PingFreq(cltmp),
ConFreq(cltmp), MaxLinks(cltmp), MaxSendq(cltmp),
- Links(cltmp));
+ Links(cltmp) + 1);
}
/** Return maximum SendQ length for a client.
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
