Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-03-20 01:38:13 UTC
Modified files:
ircd/channel.c ChangeLog
Log message:
Properly preserve empty +A channels.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.566 ircu2.10/ChangeLog:1.567
--- ircu2.10/ChangeLog:1.566 Sat Mar 19 15:22:09 2005
+++ ircu2.10/ChangeLog Sat Mar 19 17:38:01 2005
@@ -1,5 +1,11 @@
2005-03-19 Michael Poole <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
+
* include/IPcheck.h (IPcheck_connect_fail): Take a Client
parameter instead of irc_in_addr.
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.118 ircu2.10/ircd/channel.c:1.119
--- ircu2.10/ircd/channel.c:1.118 Wed Feb 23 19:07:02 2005
+++ ircu2.10/ircd/channel.c Sat Mar 19 17:38:01 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Channel management and maintanance
- * @version $Id: channel.c,v 1.118 2005/02/24 03:07:02 entrope Exp $
+ * @version $Id: channel.c,v 1.119 2005/03/20 01:38:01 entrope Exp $
*/
#include "config.h"
@@ -259,7 +259,7 @@
* 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 */
----------------------- End of diff -----------------------
