X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..fdd0b6ccf1418019192b33d4c35604ea07afff9d:/modules/core/m_mode.c

diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 25b251c..42df7ed 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -25,24 +25,21 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "balloc.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
 #include "s_conf.h"
 #include "s_serv.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
-#include "sprintf_irc.h"
 #include "s_newconf.h"
 
 static int m_mode(struct Client *, struct Client *, int, const char **);
@@ -69,7 +66,6 @@ DECLARE_MODULE_AV1(mode, NULL, NULL, mode_clist, NULL, NULL, "$Revision: 1006 $"
 
 /*
  * m_mode - MODE command handler
- * parv[0] - sender
  * parv[1] - channel
  */
 static int
@@ -136,9 +132,6 @@ m_mode(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	{
 		msptr = find_channel_membership(chptr, source_p);
 
-		if(is_deop(msptr))
-			return 0;
-
 		/* Finish the flood grace period... */
 		if(MyClient(source_p) && !IsFloodDone(source_p))
 		{
@@ -205,10 +198,6 @@ ms_tmode(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		msptr = find_channel_membership(chptr, source_p);
 
-		/* this can still happen on a mixed ts network. */
-		if(is_deop(msptr))
-			return 0;
-
 		set_channel_mode(client_p, source_p, chptr, msptr, parc - 3, parv + 3);
 	}
 
@@ -221,7 +210,7 @@ ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char
 	static char modebuf[BUFSIZE];
 	static char parabuf[BUFSIZE];
 	struct Channel *chptr;
-	dlink_list *banlist;
+	rb_dlink_list *banlist;
 	const char *s;
 	char *t;
 	char *mbuf;
@@ -287,7 +276,7 @@ ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char
 		fakesource_p = &me;
 	else
 		fakesource_p = source_p;
-	mlen = ircsprintf(modebuf, ":%s MODE %s +", fakesource_p->name, chptr->chname);
+	mlen = rb_sprintf(modebuf, ":%s MODE %s +", fakesource_p->name, chptr->chname);
 	mbuf = modebuf + mlen;
 	pbuf = parabuf;
 
@@ -335,7 +324,7 @@ ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char
 			}
 
 			*mbuf++ = parv[3][0];
-			arglen = ircsprintf(pbuf, "%s ", s);
+			arglen = rb_sprintf(pbuf, "%s ", s);
 			pbuf += arglen;
 			plen += arglen;
 			modecount++;