From: Michael Poole <mdpoole@troilus.org>
Date: Sun, 20 Mar 2005 01:38:01 +0000 (+0000)
Subject: Properly preserve empty +A channels.
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=bcc3a52d66f291293a682c3881cf470c6e573365

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 61af3fb..22f5704 100644
--- 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 c311e4e..f416f12 100644
--- 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 */