#include "client.h"
#include "hash.h"
#include "ircd.h"
+#include "ircd_features.h"
#include "ircd_log.h"
#include "ircd_reply.h"
#include "ircd_string.h"
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);
(MODEBUF_DEST_CHANNEL | /* Send mode to clients */
MODEBUF_DEST_SERVER | /* Send mode to servers */
MODEBUF_DEST_HACK4)); /* Send a HACK(4) message */
+ else if (!feature_bool(FEAT_OPLEVELS))
+ modebuf_init(&mbuf, sptr, cptr, chptr,
+ (MODEBUF_DEST_CHANNEL | /* Send mode to clients */
+ MODEBUF_DEST_SERVER | /* Send mode to servers */
+ MODEBUF_DEST_HACK3)); /* Send a HACK(3) message */
else
/* Servers need to be able to op people who join using the Apass
- * or upass, as well as people joining a zannel, therefore we no
- * longer generate HACK3. */
+ * or upass, as well as people joining a zannel, therefore we do
+ * not generate HACK3 when oplevels are on. */
modebuf_init(&mbuf, sptr, cptr, chptr,
(MODEBUF_DEST_CHANNEL | /* Send mode to clients */
MODEBUF_DEST_SERVER)); /* Send mode to servers */
MODE_PARSE_FORCE), /* And force it to be accepted */
NULL);
} else {
- if (!(member = find_member_link(chptr, sptr))
- /* Allow people to op themselves on an empty channel. */
- || (!IsChanOp(member) && chptr->users > 1)) {
+ 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 */