Wipe out all modes in a wiped-out channel by default.

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

diff --git a/ChangeLog b/ChangeLog
index 8959fef03f27ab3e336aaa0576b6a66834de1d90..5ccf170b830287683c19a9886a60b855f15a881e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-12  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/m_burst.c: Mask off channel modes in a wiped-out channel by
+       default rather than by listing which should be wiped out.
+
 2004-10-09  Michael Poole <mdpoole@troilus.org>
 
        * ircd/m_server.c: Forward port checks for leaf and hub config

diff --git a/ircd/m_burst.c b/ircd/m_burst.c
index 6c9fd1d89c557b1c89f99ad6741054c23c811833..9e44eca07c8b03d716b0f4a61f01b2dffa3262d8 100644 (file)
--- a/ircd/m_burst.c
+++ b/ircd/m_burst.c
@@ -274,9 +274,7 @@ int ms_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     modebuf_init(mbuf = &modebuf, &me, cptr, chptr,
                 MODEBUF_DEST_CHANNEL | MODEBUF_DEST_NOKEY);
     modebuf_mode(mbuf, MODE_DEL | chptr->mode.mode); /* wipeout modes */
-    chptr->mode.mode &= ~(MODE_ADD | MODE_DEL | MODE_PRIVATE | MODE_SECRET |
-                         MODE_MODERATED | MODE_TOPICLIMIT | MODE_INVITEONLY |
-                         MODE_NOPRIVMSGS | MODE_DELJOINS);
+    chptr->mode.mode &= MODE_LISTED | MODE_BURSTADDED | MODE_WASDELJOINS;
 
     parse_flags |= (MODE_PARSE_SET | MODE_PARSE_WIPEOUT); /* wipeout keys */