From 1bfed6df705272f053de14e32184739a7490c87e Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Fri, 26 Aug 2005 02:36:33 +0000 Subject: [PATCH] Silence channel manager once Apass set; fix /stats y links count. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1466 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 9 +++++++++ ircd/channel.c | 5 +++-- ircd/class.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9a4fb7..acf7fd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-08-25 Michael Poole + + * 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 * ircd/channel.c (mode_parse): Accept +A/+U from servers diff --git a/ircd/channel.c b/ircd/channel.c index 796f13b..4d99df7 100644 --- a/ircd/channel.c +++ b/ircd/channel.c @@ -657,14 +657,15 @@ int member_can_send_to_channel(struct Membership* member, int reveal) 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; diff --git a/ircd/class.c b/ircd/class.c index 95b6f96..772f44d 100644 --- a/ircd/class.c +++ b/ircd/class.c @@ -257,7 +257,7 @@ report_classes(struct Client *sptr, const struct StatDesc *sd, 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. -- 2.20.1