#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"
#include "msg.h"
#include "s_user.h"
#include "send.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <stdlib.h>
#include <string.h>
if (parc < 2)
return need_more_params(sptr, "MODE");
- clean_channelname(parv[1]);
+ if (!IsChannelName(parv[1]) || !(chptr = FindChannel(parv[1])))
+ {
+ struct Client *acptr;
- if (('#' != *parv[1] && '&' != *parv[1] && '+' != *parv[1]) ||
- !(chptr = FindChannel(parv[1])))
- return set_user_mode(cptr, sptr, parc, parv);
+ 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);
+ }
- cli_flags(sptr) &= ~FLAGS_TS8;
+ ClrFlag(sptr, FLAG_TS8);
member = find_member_link(chptr, sptr);
if (IsLocalChannel(parv[1]))
return 0;
- if (('#' != *parv[1] && '+' != *parv[1])|| !(chptr = FindChannel(parv[1])))
- return set_user_mode(cptr, sptr, parc, parv);
+ if (!(chptr = FindChannel(parv[1])))
+ {
+ 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);
+ }
- cli_flags(sptr) &= ~FLAGS_TS8;
+ ClrFlag(sptr, FLAG_TS8);
if (IsServer(sptr)) {
if (find_conf_byhost(cli_confs(cptr), cli_name(sptr), CONF_UWORLD))
(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, therefore we accept modes for channels with an Apass
- * without generating a 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 */
- (*chptr->mode.apass ? 0 : MODEBUF_DEST_HACK3)));
+ MODEBUF_DEST_SERVER)); /* Send mode to servers */
mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
(MODE_PARSE_SET | /* Set the mode */