X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_clearmode.c;h=81392da469942342c67b2c07f85302629874fd7f;hb=a36ad5e29241b0c89379947b13887cb6930ef3e0;hp=4d01f5f6f73a52149b387a93686f2b9baba5d261;hpb=be28fad14b46a9012bc2367b609daef19e7646eb;p=ircu2.10.12-pk.git

diff --git a/ircd/m_clearmode.c b/ircd/m_clearmode.c
index 4d01f5f..81392da 100644
--- a/ircd/m_clearmode.c
+++ b/ircd/m_clearmode.c
@@ -98,7 +98,7 @@
 #include "s_conf.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * do_clearmode(struct Client *cptr, struct Client *sptr,
@@ -131,7 +131,7 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
   char control_buf[20];
   int control_buf_i = 0;
   struct ModeBuf mbuf;
-  struct SLink *link, *next;
+  struct Ban *link, *next;
   struct Membership *member;
 
   /* Ok, so what are we supposed to get rid of? */
@@ -177,13 +177,13 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
    */
   if (del_mode & MODE_BAN) {
     for (link = chptr->banlist; link; link = next) {
+      char *bandup;
       next = link->next;
 
+      DupString(bandup, link->banstr);
       modebuf_mode_string(&mbuf, MODE_DEL | MODE_BAN, /* delete ban */
-			  link->value.ban.banstr, 1);
-
-      MyFree(link->value.ban.who); /* free up who string */
-      free_link(link); /* and of course the link itself */
+			  bandup, 1);
+      free_ban(link);
     }
 
     chptr->banlist = 0;
@@ -200,13 +200,13 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
 
       /* Drop channel operator status */
       if (IsChanOp(member) && del_mode & MODE_CHANOP) {
-	modebuf_mode_client(&mbuf, MODE_DEL | MODE_CHANOP, member->user);
+	modebuf_mode_client(&mbuf, MODE_DEL | MODE_CHANOP, member->user, MAXOPLEVEL + 1);
 	member->status &= ~CHFL_CHANOP;
       }
 
       /* Drop voice */
       if (HasVoice(member) && del_mode & MODE_VOICE) {
-	modebuf_mode_client(&mbuf, MODE_DEL | MODE_VOICE, member->user);
+	modebuf_mode_client(&mbuf, MODE_DEL | MODE_VOICE, member->user, MAXOPLEVEL + 1);
 	member->status &= ~CHFL_VOICE;
       }
     }
@@ -253,7 +253,7 @@ ms_clearmode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     return need_more_params(sptr, "CLEARMODE");
 
   if (!IsPrivileged(sptr)) {
-    protocol_violation(sptr,"No priviledges on source for CLEARMODE, desync?");
+    protocol_violation(sptr,"No privileges on source for CLEARMODE, desync?");
     return send_reply(sptr, ERR_NOPRIVILEGES);
   }