return send_reply(sptr, ERR_NOSUCHCHANNEL, name);
if (!(member2 = find_member_link(chptr, sptr)) || IsZombie(member2)
- || (!IsChanOp(member2) && !(IsNetServ(sptr) && IsSecurityServ(sptr) && IsChannelService(sptr))))
+ || (!IsChanOpOrHalfOp(member2) && !(IsNetServ(sptr) && IsSecurityServ(sptr) && IsChannelService(sptr))))
return send_reply(sptr, ERR_CHANOPRIVSNEEDED, name);
if (!(who = find_chasing(sptr, parv[2], 0)))
/* check if kicked user is actually on the channel */
if (!(member = find_member_link(chptr, who)) || IsZombie(member) || (IsInvisibleJoin(member) && IsDelayedJoin(member)))
return send_reply(sptr, ERR_USERNOTINCHANNEL, cli_name(who), chptr->chname);
+
+ /* Don't allow oped users to be kicked by halfops */
+ if (IsChanOp(member) && !IsChanOp(member2) && who != sptr)
+ return send_reply(sptr, ERR_CHANOPRIVSNEEDED, name);
/* Don't allow to kick member with a higher op-level,
* or members with the same op-level unless both are MAXOPLEVEL.
/* We go ahead and pass on the KICK for users not on the channel */
member = find_member_link(chptr, who);
- if((IsInvisibleJoin(member) && IsDelayedJoin(member)))
+ if(member && (IsInvisibleJoin(member) && IsDelayedJoin(member)))
return 0;
if (member && IsZombie(member))
{