}
}
- /* If channel persistent and client is ircop: make client chanop */
- if (strchr(Channel_Modes(chan), 'P') && strchr(Client_Modes(target), 'o'))
+ /* If the channel is persistent (+P) and client is an IRC op:
+ * make client chanop, if not disabled in configuration. */
+ if (strchr(Channel_Modes(chan), 'P') && Conf_OperChanPAutoOp
+ && strchr(Client_Modes(target), 'o'))
Channel_UserModeAdd(chan, target, 'o');
} /* join_set_channelmodes */
chan = Channel_Search(channame);
if (!chan && Conf_PredefChannelsOnly) {
/* channel must be created, but forbidden by config */
- IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG,
+ IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
Client_ID(Client), channame);
goto join_next;
}
CHANNEL *chan;
CLIENT *from;
char *topic;
- bool r, is_oper;
+ bool r, topic_power;
assert( Client != NULL );
assert( Req != NULL );
return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG,
Client_ID(from), Req->argv[0]);
- /* Only IRC opers and channel members allowed */
- is_oper = Client_OperByMe(from);
- if (!Channel_IsMemberOf(chan, from) && !is_oper)
- return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG,
- Client_ID(from), Req->argv[0]);
+ /* Only remote servers and channel members are allowed to change the
+ * channel topic, and IRC opreators when the Conf_OperCanMode option
+ * is set in the server configuration. */
+ if (Client_Type(Client) != CLIENT_SERVER) {
+ topic_power = Client_HasMode(from, 'o');
+ if (!Channel_IsMemberOf(chan, from)
+ && !(Conf_OperCanMode && topic_power))
+ return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG,
+ Client_ID(from), Req->argv[0]);
+ } else
+ topic_power = true;
if (Req->argc == 1) {
/* Request actual topic */
if (strchr(Channel_Modes(chan), 't')) {
/* Topic Lock. Is the user a channel op or IRC operator? */
- if(!strchr(Channel_UserModes(chan, from), 'h') &&
+ if(!topic_power &&
+ !strchr(Channel_UserModes(chan, from), 'h') &&
!strchr(Channel_UserModes(chan, from), 'o') &&
!strchr(Channel_UserModes(chan, from), 'a') &&
- !strchr(Channel_UserModes(chan, from), 'q') &&
- !is_oper)
+ !strchr(Channel_UserModes(chan, from), 'q'))
return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
Client_ID(from),
Channel_Name(chan));
if (MatchCaseInsensitive(pattern, Channel_Name(chan))) {
/* Gotcha! */
if (!strchr(Channel_Modes(chan), 's')
- || Channel_IsMemberOf(chan, from)) {
- if (IRC_CheckListTooBig(from, count,
- MAX_RPL_LIST,
- "LIST"))
+ || Channel_IsMemberOf(chan, from)
+ || (!Conf_MorePrivacy && Client_OperByMe(Client))) {
+ if ((Conf_MaxListSize > 0)
+ && IRC_CheckListTooBig(from, count,
+ Conf_MaxListSize,
+ "LIST"))
break;
if (!IRC_WriteStrClient(from,
RPL_LIST_MSG, Client_ID(from),