Revision: 1941
http://undernet-ircu.svn.sourceforge.net/undernet-ircu/?rev=1941&view=rev
Author: entrope
Date: 2010-01-14 02:35:51 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
Revert r1340 (it was apparently always buggy).
chapo wanted to know why he saw *.undernet.org -lkko+ko * * chapo * ...
after a burst; this code was the reason that it did -k * twice.
Modified Paths:
--------------
ircu2/branches/u2_10_12_branch/ChangeLog
ircu2/branches/u2_10_12_branch/ircd/m_burst.c
Modified: ircu2/branches/u2_10_12_branch/ChangeLog
===================================================================
--- ircu2/branches/u2_10_12_branch/ChangeLog 2010-01-07 04:24:07 UTC (rev
1940)
+++ ircu2/branches/u2_10_12_branch/ChangeLog 2010-01-14 02:35:51 UTC (rev
1941)
@@ -1,3 +1,8 @@
+2010-01-13 Michael Poole <[email protected]>
+
+ * ircd/m_burst.c (ms_burst): Do not clear keys or limit here --
+ MODE_PARSE_WIPEOUT gets modebuf_flush() to do that for us.
+
2010-01-06 Michael Poole <[email protected]>
* Makefile.in: Remove doc/Makefile from the build.
Modified: ircu2/branches/u2_10_12_branch/ircd/m_burst.c
===================================================================
--- ircu2/branches/u2_10_12_branch/ircd/m_burst.c 2010-01-07 04:24:07 UTC
(rev 1940)
+++ ircu2/branches/u2_10_12_branch/ircd/m_burst.c 2010-01-14 02:35:51 UTC
(rev 1941)
@@ -336,26 +336,9 @@
modebuf_mode(mbuf, MODE_DEL | chptr->mode.mode); /* wipeout modes */
chptr->mode.mode &= MODE_BURSTADDED | MODE_WASDELJOINS;
- /* wipe out modes not represented in chptr->mode.mode */
- if (chptr->mode.limit) {
- modebuf_mode_uint(mbuf, MODE_DEL | MODE_LIMIT, chptr->mode.limit);
- chptr->mode.limit = 0;
- }
- if (chptr->mode.key[0]) {
- modebuf_mode_string(mbuf, MODE_DEL | MODE_KEY, chptr->mode.key, 0);
- chptr->mode.key[0] = '\0';
- }
- if (chptr->mode.upass[0]) {
- modebuf_mode_string(mbuf, MODE_DEL | MODE_UPASS, chptr->mode.upass, 0);
- chptr->mode.upass[0] = '\0';
- }
- if (chptr->mode.apass[0]) {
- modebuf_mode_string(mbuf, MODE_DEL | MODE_APASS, chptr->mode.apass, 0);
- chptr->mode.apass[0] = '\0';
- }
+ /* wipeout any limit and keys that are set */
+ parse_flags |= (MODE_PARSE_SET | MODE_PARSE_WIPEOUT);
- parse_flags |= (MODE_PARSE_SET | MODE_PARSE_WIPEOUT); /* wipeout keys */
-
/* mark bans for wipeout */
for (lp = chptr->banlist; lp; lp = lp->next)
lp->flags |= BAN_BURST_WIPEOUT;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
