From f0c926ef4662365b60821aec57961145fb7b6ce8 Mon Sep 17 00:00:00 2001 From: "Kevin L. Mitchell" Date: Fri, 31 Mar 2000 15:35:18 +0000 Subject: [PATCH] Author: Kev Log message: * ircd/m_clearmode.c (do_clearmode): made sure clearmode removed keys and limits that are set git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@110 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 7 ++++++- ircd/m_clearmode.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cda5b24..e3bc9fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-03-31 Kevin L. Mitchell + + * ircd/m_clearmode.c (do_clearmode): made sure clearmode removed + keys and limits that are set + 2000-03-30 Perry Lorier * ircd/ircd.c: rewrote check_pings() for maintainability and speed. Also changed quit msg's so they don't have @@ -221,7 +226,7 @@ # # ChangeLog for ircu2.10.11 # -# $Id: ChangeLog,v 1.46 2000-03-30 22:09:51 isomer Exp $ +# $Id: ChangeLog,v 1.47 2000-03-31 15:35:18 kev Exp $ # # Insert new changes at beginning of the change list. # diff --git a/ircd/m_clearmode.c b/ircd/m_clearmode.c index 360c314..248ab51 100644 --- a/ircd/m_clearmode.c +++ b/ircd/m_clearmode.c @@ -167,11 +167,11 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr, * If we're removing the key, note that; note that we can't clear * the key until after modebuf_* are done with it */ - if (del_mode & MODE_KEY && chptr->mode.mode & MODE_KEY) + if (del_mode & MODE_KEY && *chptr->mode.key) modebuf_mode_string(&mbuf, MODE_DEL | MODE_KEY, chptr->mode.key); /* If we're removing the limit, note that and clear the limit */ - if (del_mode & MODE_LIMIT && chptr->mode.mode & MODE_KEY) { + if (del_mode & MODE_LIMIT && chptr->mode.limit) { modebuf_mode_uint(&mbuf, MODE_DEL | MODE_LIMIT, chptr->mode.limit); chptr->mode.limit = 0; /* not referenced, so safe */ } -- 2.20.1