#include "client.h"
#include "hash.h"
#include "ircd.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 (('#' != *parv[1] && '&' != *parv[1] && '+' != *parv[1]) ||
- !(chptr = FindChannel(parv[1])))
+ if (!IsChannelName(parv[1]) || !(chptr = FindChannel(parv[1])))
return set_user_mode(cptr, sptr, parc, parv);
- cli_flags(sptr) &= ~FLAGS_TS8;
+ ClrFlag(sptr, FLAG_TS8);
+
+ member = find_member_link(chptr, sptr);
if (parc < 3) {
char modebuf[MODEBUFLEN];
*modebuf = *parabuf = '\0';
modebuf[1] = '\0';
- channel_modes(sptr, modebuf, parabuf, sizeof(parabuf), chptr);
+ channel_modes(sptr, modebuf, parabuf, sizeof(parabuf), chptr, member);
send_reply(sptr, RPL_CHANNELMODEIS, chptr->chname, modebuf, parabuf);
send_reply(sptr, RPL_CREATIONTIME, chptr->chname, chptr->creationtime);
return 0;
}
- if (!(member = find_member_link(chptr, sptr)) || !IsChanOp(member)) {
+ if (!member || !IsChanOp(member)) {
if (IsLocalChannel(chptr->chname) && HasPriv(sptr, PRIV_MODE_LCHAN)) {
modebuf_init(&mbuf, sptr, cptr, chptr,
(MODEBUF_DEST_CHANNEL | /* Send mode to channel */
MODEBUF_DEST_HACK4)); /* Send HACK(4) notice */
mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
(MODE_PARSE_SET | /* Set the mode */
- MODE_PARSE_FORCE)); /* Force it to take */
+ MODE_PARSE_FORCE), /* Force it to take */
+ member);
return modebuf_flush(&mbuf);
} else
mode_parse(0, cptr, sptr, chptr, parc - 2, parv + 2,
- (member ? MODE_PARSE_NOTOPER : MODE_PARSE_NOTMEMBER));
+ (member ? MODE_PARSE_NOTOPER : MODE_PARSE_NOTMEMBER), member);
return 0;
}
modebuf_init(&mbuf, sptr, cptr, chptr,
(MODEBUF_DEST_CHANNEL | /* Send mode to channel */
MODEBUF_DEST_SERVER)); /* Send mode to servers */
- mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, MODE_PARSE_SET);
+ mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, MODE_PARSE_SET, member);
return modebuf_flush(&mbuf);
}
if (IsLocalChannel(parv[1]))
return 0;
- if (('#' != *parv[1] && '+' != *parv[1])|| !(chptr = FindChannel(parv[1])))
+ if (!(chptr = FindChannel(parv[1])))
return set_user_mode(cptr, sptr, parc, parv);
- 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_SERVER | /* Send mode to servers */
MODEBUF_DEST_HACK4)); /* Send a HACK(4) 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. */
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 */
+ MODEBUF_DEST_SERVER | /* Send mode to servers */
+ (*chptr->mode.apass ? 0 : MODEBUF_DEST_HACK3)));
mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
(MODE_PARSE_SET | /* Set the mode */
MODE_PARSE_STRICT | /* Interpret it strictly */
- MODE_PARSE_FORCE)); /* And force it to be accepted */
+ MODE_PARSE_FORCE), /* And force it to be accepted */
+ NULL);
} else {
if (!(member = find_member_link(chptr, sptr)) || !IsChanOp(member)) {
modebuf_init(&mbuf, sptr, cptr, chptr,
MODEBUF_DEST_BOUNCE)); /* And bounce the MODE */
mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
(MODE_PARSE_STRICT | /* Interpret it strictly */
- MODE_PARSE_BOUNCE)); /* And bounce the MODE */
+ MODE_PARSE_BOUNCE), /* And bounce the MODE */
+ member);
} else {
modebuf_init(&mbuf, sptr, cptr, chptr,
(MODEBUF_DEST_CHANNEL | /* Send mode to clients */
mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
(MODE_PARSE_SET | /* Set the mode */
MODE_PARSE_STRICT | /* Interpret it strictly */
- MODE_PARSE_FORCE)); /* And force it to be accepted */
+ MODE_PARSE_FORCE), /* And force it to be accepted */
+ member);
}
}