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

diff --git a/ChangeLog b/ChangeLog
index a9a4fb7265055f0d60bf5098fbe8c3f430515e95..acf7fd97a8018871d9c82cf770fb47764bd2edb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-25  Michael Poole <mdpoole@troilus.org>
+
+       * 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 <mdpoole@troilus.org>
 
        * ircd/channel.c (mode_parse): Accept +A/+U from servers

diff --git a/ircd/channel.c b/ircd/channel.c
index 796f13b53f06fd3afda3edf098db3a96cc2d532d..4d99df794f0969b78505db561bcb4b29e9bb5241 100644 (file)
--- 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 95b6f96c5eae845f22fdbbc30bbcb52662b04a31..772f44d175f06217c7d75ee935c5c9e2d6d05494 100644 (file)
--- 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.