return need_more_params(sptr, "MODE");
if (!IsChannelName(parv[1]) || !(chptr = FindChannel(parv[1])))
- return set_user_mode(cptr, sptr, parc, parv);
+ {
+ struct Client *acptr;
+
+ acptr = FindUser(parv[1]);
+ if (!acptr)
+ {
+ send_reply(sptr, ERR_NOSUCHCHANNEL, parv[1]);
+ return 0;
+ }
+ else if (sptr != acptr)
+ {
+ send_reply(sptr, ERR_USERSDONTMATCH);
+ return 0;
+ }
+ return set_user_mode(cptr, sptr, parc, parv, ALLOWMODES_ANY);
+ }
ClrFlag(sptr, FLAG_TS8);
return 0;
if (!(chptr = FindChannel(parv[1])))
- return set_user_mode(cptr, sptr, parc, parv);
+ {
+ struct Client *acptr;
+
+ acptr = FindUser(parv[1]);
+ if (!acptr)
+ {
+ return 0;
+ }
+ else if (sptr != acptr)
+ {
+ sendwallto_group_butone(&me, WALL_WALLOPS, 0,
+ "MODE for User %s from %s!%s", parv[1],
+ cli_name(cptr), cli_name(sptr));
+ return 0;
+ }
+ return set_user_mode(cptr, sptr, parc, parv, ALLOWMODES_ANY);
+ }
ClrFlag(sptr, FLAG_TS8);
MODE_PARSE_FORCE), /* And force it to be accepted */
NULL);
} else {
- if (!(member = find_member_link(chptr, sptr))) {
+ if (!(member = find_member_link(chptr, sptr)) || !IsChanOp(member)) {
modebuf_init(&mbuf, sptr, cptr, chptr,
(MODEBUF_DEST_SERVER | /* Send mode to server */
MODEBUF_DEST_HACK2 | /* Send a HACK(2) message */