Author: Kev <klmitch@mit.edu>

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

diff --git a/ChangeLog b/ChangeLog
index cda5b24078fae6d2e07c5dffe4ac6aabc11e52e3..e3bc9fad865d4ea705cb05d52c02c89c571b5aae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-31  Kevin L. Mitchell  <klmitch@mit.edu>
+
+       * ircd/m_clearmode.c (do_clearmode): made sure clearmode removed
+       keys and limits that are set
+
 2000-03-30  Perry Lorier <isomer@coders.net>
        * 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 360c314bc4cdb292544f0d35b5496e520e77dfdc..248ab5184d4d28e420cac4c087f6211237e5ded0 100644 (file)
--- 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 */
   }