From 2fbe1c3ccc35099d105552c0eef8eb566c97662d Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Thu, 14 Jan 2010 02:35:51 +0000 Subject: [PATCH] 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. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1941 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 5 +++++ ircd/m_burst.c | 21 ++------------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 151daae..a979755 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-01-13 Michael Poole + + * 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 * Makefile.in: Remove doc/Makefile from the build. diff --git a/ircd/m_burst.c b/ircd/m_burst.c index f1e4429..00e4265 100644 --- a/ircd/m_burst.c +++ b/ircd/m_burst.c @@ -336,25 +336,8 @@ int ms_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) 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'; - } - - parse_flags |= (MODE_PARSE_SET | MODE_PARSE_WIPEOUT); /* wipeout keys */ + /* wipeout any limit and keys that are set */ + parse_flags |= (MODE_PARSE_SET | MODE_PARSE_WIPEOUT); /* mark bans for wipeout */ for (lp = chptr->banlist; lp; lp = lp->next) -- 2.20.1