Properly preserve empty +A channels.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1330 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 61af3fb33eded479936874a218e7f3278f17266d..22f5704776ca7c2cb26e5d6b27126a40dbdbdd31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-19  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/channel.c (sub1_from_channel): Check apass rather than mode
+       to determine whether an apass is set (MODE_KEY/APASS/UPASS are not
+       set in mode.mode).
+
 2005-03-19  Michael Poole <mdpoole@troilus.org>
 
        * include/IPcheck.h (IPcheck_connect_fail): Take a Client

diff --git a/ircd/channel.c b/ircd/channel.c
index c311e4e3f8811b8992872556502ceb423510448d..f416f123dfd9f05cbf5996fc184914c2ef389647 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -259,7 +259,7 @@ int sub1_from_channel(struct Channel* chptr)
    * who then will educate them on the use of Apass/upass.
    */
 
-  if (!(chptr->mode.mode & MODE_APASS))         /* If no Apass, destroy now. */
+  if (!chptr->mode.apass[0])         /* If no Apass, destroy now. */
     destruct_channel(chptr);
   else if (TStime() - chptr->creationtime < 172800)    /* Channel younger than 48 hours? */
     schedule_destruct_event_1m(chptr);         /* Get rid of it in approximately 4-5 minutes */