#include "hash.h"
#include "packet.h"
#include "s_serv.h"
+#include "s_conf.h"
#include "hook.h"
static int m_kick(struct Client *, struct Client *, int, const char **);
char *p = NULL;
const char *user;
static char buf[BUFSIZE];
+ int is_override = 0;
if(MyClient(source_p) && !IsFloodDone(source_p))
flood_endgrace(source_p);
return 0;
}
+ user = parv[2]; /* strtoken(&p2, parv[2], ","); */
+
+ if(!(who = find_chasing(source_p, user, &chasing)))
+ {
+ return 0;
+ }
+
if(!IsServer(source_p))
{
msptr = find_channel_membership(chptr, source_p);
return 0;
}
- if(!is_chanop(msptr))
+ if(!can_kick_deop(msptr, find_channel_membership(chptr, who)))
{
if(MyConnect(source_p))
{
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, name);
- return 0;
+ if(IsOverride(source_p))
+ is_override = 1;
+ else
+ {
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, name);
+ return 0;
+ }
}
/* If its a TS 0 channel, do it the old way */
- if(chptr->channelts == 0)
+ else if(chptr->channelts == 0)
{
sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
get_id(&me, source_p), get_id(source_p, source_p), name);
if((p = strchr(parv[2], ',')))
*p = '\0';
- user = parv[2]; /* strtoken(&p2, parv[2], ","); */
-
- if(!(who = find_chasing(source_p, user, &chasing)))
- {
- return 0;
- }
-
msptr = find_channel_membership(chptr, who);
if(msptr != NULL)
return 0;
}
+ if (MyClient(source_p) && chptr->mode.mode & MODE_NOOPERKICK && IsOper(who))
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+ "Overriding KICK from %s on %s in %s (channel is +M)",
+ source_p->name, who->name, chptr->chname);
+ sendto_one_numeric(source_p, ERR_ISCHANSERVICE,
+ "%s %s :Cannot kick IRC operators from that channel.",
+ who->name, chptr->chname);
+ return 0;
+ }
+
if(MyClient(source_p))
{
hook_data_channel_approval hookdata;
if(strlen(comment) > (size_t) REASONLEN)
comment[REASONLEN] = '\0';
+ if(is_override)
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+ "%s is overriding KICK [%s] on [%s] [%s]",
+ get_oper_name(source_p), who->name, chptr->chname, comment);
+
/* jdc
* - In the case of a server kicking a user (i.e. CLEARCHAN),
* the kick should show up as coming from the server which did