* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/** @file
- * @brief Channel management and maintanance
+ * @brief Channel management and maintenance
* @version $Id$
*/
#include "config.h"
* numeric nicks is no longer quite as important.
*
* @param sptr Pointer to the client that has requested the search
- * @param user a string represeting the client to be found
+ * @param user a string representing the client to be found
* @param chasing a variable set to 0 if the user was found directly,
* 1 otherwise
* @returns a pointer the client, or NULL if the client wasn't found.
return (member && !IsZombie(member)) ? member : 0;
}
-/** Searches for a ban from a banlist that matches a user.
+/** Searches for a ban from a ban list that matches a user.
* @param[in] cptr The client to test.
* @param[in] banlist The list of bans to test.
* @return Pointer to a matching ban, or NULL if none exit.
/** Remove a user from a channel
* This is the generic entry point for removing a user from a channel, this
- * function will remove the client from the channel, and destory the channel
+ * function will remove the client from the channel, and destroy the channel
* if there are no more normal users left.
*
* @param cptr The client
if (IsVoicedOrOpped(member))
return 1;
/*
- * If it's moderated, and you aren't a priviledged user, you can't
+ * If it's moderated, and you aren't a privileged user, you can't
* speak.
*/
if (member->channel->mode.mode & MODE_MODERATED)
return 0;
+ /* If only logged in users may join and you're not one, you can't speak. */
+ if (member->channel->mode.mode & MODE_REGONLY && !IsAccount(member->user))
+ return 0;
/*
* If you're banned then you can't speak either.
* but because of the amount of CPU time that is_banned chews
int opped_members_index = 0;
struct Membership** opped_members = NULL;
int last_oplevel = 0;
- int feat_oplevels = (chptr->mode.mode & MODE_APASS) != 0;
+ int feat_oplevels = (chptr->mode.apass[0]) != '\0';
assert(0 != cptr);
assert(0 != chptr);
}
/*
- * Attach nicks, comma seperated " nick[:modes],nick[:modes],..."
+ * Attach nicks, comma separated " nick[:modes],nick[:modes],..."
*
* First find all opless members.
* Run 2 times over all members, to group the members with
* Do we have a nick with a new mode ?
* Or are we starting a new BURST line?
*/
- if (new_mode || !feat_oplevels)
+ if (new_mode)
{
/*
* This means we are at the _first_ member that has only
msgq_append(&me, mb, tbuf);
new_mode = 0;
}
- else if (flag_cnt > 1 && last_oplevel != member->oplevel)
+ else if (feat_oplevels && flag_cnt > 1 && last_oplevel != member->oplevel)
{
/*
* This can't be the first member of a (continued) BURST
if (!full)
{
- /* Attach all bans, space seperated " :%ban ban ..." */
+ /* Attach all bans, space separated " :%ban ban ..." */
for (first = 2; lp2; lp2 = lp2->next)
{
len = strlen(lp2->banstr);
* This version contributed by SeKs \<intru@info.polymtl.ca\>
*
* @param key Key to check
- * @param keyring Comma seperated list of keys
+ * @param keyring Comma separated list of keys
*
* @returns True if the key was found and matches, false otherwise.
*/
* @param chptr The channel to join
* @param key The key to use
*
- * @returns any error that occured bitwised OR'd with MAGIC_OPER_OVERRIDE
- * if the oper used the magic key, 0 if no error occured.
+ * @returns any error that occurred bit-wise OR'd with MAGIC_OPER_OVERRIDE
+ * if the oper used the magic key, 0 if no error occurred.
*/
int can_join(struct Client *sptr, struct Channel *chptr, char *key)
{
*
* We also need to turn 'who' into a zombie on servers 1 and 6,
* because a KICK from 'who' (kicking someone else in that direction)
- * can arrive there afterwards - which should not be bounced itself.
+ * can arrive there afterward - which should not be bounced itself.
* Therefore case a) also applies for servers 1 and 6.
*
* --Run
*
* @param strptr The buffer to concatenate into
* @param strptr_i modified offset to the position to modify
- * @param str1 The string to contatenate from.
+ * @param str1 The string to concatenate from.
* @param str2 The second string to contatenate from.
- * @param c Charactor to seperate the string from str1 and str2.
+ * @param c Charactor to separate the string from str1 and str2.
*/
static void
build_string(char *strptr, int *strptr_i, const char *str1,
if (state->flags & MODE_PARSE_FORCE && MyUser(state->sptr)
&& !HasPriv(state->sptr, PRIV_APASS_OPMODE)) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Use /JOIN", state->chptr->chname, " <AdminPass>.");
+ state->chptr->chname);
return;
}
if (MyUser(state->sptr) && !(state->flags & MODE_PARSE_FORCE || IsChannelManager(state->member))) {
if (*state->chptr->mode.apass) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Use /JOIN", state->chptr->chname, "<AdminPass>.");
+ state->chptr->chname);
+ } else if (TStime() - state->chptr->creationtime >= 171000) {
+ send_reply(state->sptr, ERR_NOMANAGER_LONG, state->chptr->chname);
} else {
- send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Re-create the channel. The channel must be *empty* for",
- TStime() - state->chptr->creationtime >= 171000 ? "48 contiguous hours" : "a minute or two",
- "before it can be recreated.");
+ send_reply(state->sptr, ERR_NOMANAGER_SHORT, state->chptr->chname);
}
return;
}
-
+
if (state->done & DONE_UPASS) /* allow upass to be set only once */
return;
state->done |= DONE_UPASS;
if (!state->mbuf)
return;
- if (!(state->flags & MODE_PARSE_FORCE))
+ if (!(state->flags & MODE_PARSE_FORCE)) {
/* can't add the upass while apass is not set */
if (state->dir == MODE_ADD && !*state->chptr->mode.apass) {
send_reply(state->sptr, ERR_UPASSNOTSET, state->chptr->chname, state->chptr->chname);
return;
}
+ /* cannot set a +U password that is the same as +A */
+ if (state->dir == MODE_ADD && !ircd_strcmp(state->chptr->mode.apass, t_str)) {
+ send_reply(state->sptr, ERR_UPASS_SAME_APASS, state->chptr->chname);
+ return;
+ }
/* can't add a upass if one is set, nor can one remove the wrong upass */
if ((state->dir == MODE_ADD && *state->chptr->mode.upass) ||
(state->dir == MODE_DEL &&
send_reply(state->sptr, ERR_KEYSET, state->chptr->chname);
return;
}
+ }
if (!(state->flags & MODE_PARSE_WIPEOUT) && state->dir == MODE_ADD &&
!ircd_strcmp(state->chptr->mode.upass, t_str))
if (state->flags & MODE_PARSE_FORCE && MyUser(state->sptr)
&& !HasPriv(state->sptr, PRIV_APASS_OPMODE)) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Use /JOIN", state->chptr->chname, " <AdminPass>.");
+ state->chptr->chname);
return;
}
if (MyUser(state->sptr) && !(state->flags & MODE_PARSE_FORCE || IsChannelManager(state->member))) {
if (*state->chptr->mode.apass) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Use /JOIN", state->chptr->chname, "<AdminPass>.");
+ state->chptr->chname);
+ } else if (TStime() - state->chptr->creationtime >= 171000) {
+ send_reply(state->sptr, ERR_NOMANAGER_LONG, state->chptr->chname);
} else {
- send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Re-create the channel. The channel must be *empty* for",
- "at least a whole minute", "before it can be recreated.");
+ send_reply(state->sptr, ERR_NOMANAGER_SHORT, state->chptr->chname);
}
return;
}
-
+
if (state->done & DONE_APASS) /* allow apass to be set only once */
return;
state->done |= DONE_APASS;
/* Make it VERY clear to the user that this is a one-time password */
ircd_strncpy(state->chptr->mode.apass, t_str, PASSLEN);
if (MyUser(state->sptr)) {
- send_reply(state->sptr, RPL_APASSWARN,
- "Channel Admin password (+A) set to '", state->chptr->mode.apass, "'. ",
- "Are you SURE you want to use this as Admin password? ",
- "You will NOT be able to change this password anymore once the channel is more than 48 hours old!");
- send_reply(state->sptr, RPL_APASSWARN,
- "Use \"/MODE ", state->chptr->chname, " -A ", state->chptr->mode.apass,
- "\" to remove the password and then immediately set a new one. "
- "IMPORTANT: YOU CANNOT RECOVER THIS PASSWORD, EVER; "
- "WRITE THE PASSWORD DOWN (don't store this rescue password on disk)! "
- "Now set the channel user password (+U).");
+ send_reply(state->sptr, RPL_APASSWARN_SET, state->chptr->mode.apass);
+ send_reply(state->sptr, RPL_APASSWARN_SECRET, state->chptr->chname,
+ state->chptr->mode.apass);
}
} else { /* remove the old apass */
*state->chptr->mode.apass = '\0';
if (MyUser(state->sptr))
- send_reply(state->sptr, RPL_APASSWARN,
- "WARNING: You removed the channel Admin password MODE (+A). ",
- "If you would disconnect or leave the channel without setting a new password then you will ",
- "not be able to set it again and lose ownership of this channel! ",
- "SET A NEW PASSWORD NOW!", "");
+ send_reply(state->sptr, RPL_APASSWARN_CLEAR);
}
}
}
*
* @param[in,out] banlist Pointer to head of list.
* @param[in] newban Ban (or exception) to add (or remove).
+ * @param[in] do_free If non-zero, free \a newban on failure.
* @return Zero if \a newban could be applied, non-zero if not.
*/
int apply_ban(struct Ban **banlist, struct Ban *newban, int do_free)
if (!bmatch(ban, newban)) {
if (do_free)
free_ban(newban);
+ else
+ MyFree(newban->banstr);
return 1;
}
if (!(ban->flags & (BAN_OVERLAPPED|BAN_DEL))) {
}
if (do_free)
free_ban(newban);
+ else
+ MyFree(newban->banstr);
return 4;
}
newban = state->banlist + (state->numbans++);
newban->next = 0;
newban->flags = ((state->dir == MODE_ADD) ? BAN_ADD : BAN_DEL)
- | (*flag_p == 'b' ? 0 : BAN_EXCEPTION);
+ | (*flag_p == MODE_BAN ? 0 : BAN_EXCEPTION);
newban->banstr = NULL;
set_ban_mask(newban, collapse(pretty_mask(t_str)));
newban->who = cli_name(state->sptr);
prevban = ban;
} /* for (prevban = 0, ban = state->chptr->banlist; ban; ban = nextban) { */
+ /* Release all masks of removed bans */
+ for (count = 0; count < state->numbans; ++count) {
+ ban = state->banlist + count;
+ if (ban->flags & BAN_DEL)
+ MyFree(ban->banstr);
+ }
+
if (changed) /* if we changed the ban list, we must invalidate the bans */
mode_ban_invalidate(state->chptr);
}
continue;
}
- if (feature_bool(FEAT_OPLEVELS)) {
/* don't allow to deop members with an op level that is <= our own level */
if (state->sptr != state->cli_change[i].client /* but allow to deop oneself */
- && state->member
- && OpLevel(member) <= OpLevel(state->member)) {
+ && state->chptr->mode.apass[0]
+ && state->member
+ && OpLevel(member) <= OpLevel(state->member)) {
int equal = (OpLevel(member) == OpLevel(state->member));
send_reply(state->sptr, ERR_NOTLOWEROPLEVEL,
cli_name(state->cli_change[i].client),
"deop", equal ? "the same" : "a higher");
continue;
}
- }
}
}
/* set op-level of member being opped */
if ((state->cli_change[i].flag & (MODE_ADD | MODE_CHANOP)) ==
(MODE_ADD | MODE_CHANOP)) {
- /* If on a channel with upass set, someone with level x gives ops to someone else,
- then that person gets level x-1. On other channels, where upass is not set,
- the level stays the same. */
- int level_increment = *state->chptr->mode.upass ? 1 : 0;
- /* Someone being opped by a server gets op-level 0 */
- int old_level = (state->member == NULL) ? -level_increment : OpLevel(state->member);
- SetOpLevel(member, old_level == MAXOPLEVEL ? MAXOPLEVEL : (old_level + level_increment));
+ /* If being opped by an outsider, get oplevel 0 for an apass
+ * channel, else MAXOPLEVEL.
+ * Otherwise, if not an apass channel, or state->member has
+ * MAXOPLEVEL, get oplevel MAXOPLEVEL.
+ * Otherwise, get state->member's oplevel+1.
+ */
+ if (!state->member)
+ SetOpLevel(member, state->chptr->mode.apass[0] ? 0 : MAXOPLEVEL);
+ else if (!state->chptr->mode.apass[0] || OpLevel(state->member) == MAXOPLEVEL)
+ SetOpLevel(member, MAXOPLEVEL);
+ else
+ SetOpLevel(member, OpLevel(state->member) + 1);
}
/* actually effect the change */
is_local) /* got to remove user here */
remove_user_from_channel(jbuf->jb_source, chan);
} else {
+ int oplevel = !chan->mode.apass[0] ? MAXOPLEVEL
+ : (flags & CHFL_CHANNEL_MANAGER) ? 0
+ : 1;
/* Add user to channel */
if ((chan->mode.mode & MODE_DELJOINS) && !(flags & CHFL_VOICED_OR_OPPED))
- add_user_to_channel(chan, jbuf->jb_source, flags | CHFL_DELAYED, 0);
+ add_user_to_channel(chan, jbuf->jb_source, flags | CHFL_DELAYED, oplevel);
else
- add_user_to_channel(chan, jbuf->jb_source, flags, 0);
+ add_user_to_channel(chan, jbuf->jb_source, flags, oplevel);
/* send notification to all servers */
if (jbuf->jb_type != JOINBUF_TYPE_CREATE && !is_local)
- sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
- "%H %Tu", chan, chan->creationtime);
+ {
+ if (flags & CHFL_CHANOP)
+ sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
+ "%u:%H %Tu", oplevel, chan, chan->creationtime);
+ else
+ sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
+ "%H %Tu", chan, chan->creationtime);
+ }
if (!((chan->mode.mode & MODE_DELJOINS) && !(flags & CHFL_VOICED_OR_OPPED))) {
/* Send the notification to the channel */
sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_JOIN, chan, NULL, 0, "%H", chan);
/* send an op, too, if needed */
- if (!MyUser(jbuf->jb_source) && jbuf->jb_type == JOINBUF_TYPE_CREATE)
- sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_MODE, chan, NULL, 0, "%H +o %C",
+ if (flags & CHFL_CHANOP)
+ sendcmdto_channel_butserv_butone((chan->mode.apass[0] ? &me : jbuf->jb_source),
+ CMD_MODE, chan, NULL, 0, "%H +o %C",
chan, jbuf->jb_source);
} else if (MyUser(jbuf->jb_source))
sendcmdto_one(jbuf->jb_source, CMD_JOIN, jbuf->jb_source, ":%H", chan);
projects / ircu2.10.12-pk.git / blobdiff