cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make joining in override only wallops if you couldn't normally join the channel.

This commit is contained in:
B.Greenham 2010-03-07 22:58:27 -05:00
parent 34d8ef4d14
commit f8b60fb5fd
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/channel.c
View File

@ -835,17 +835,6 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
s_assert(source_p->localClient != NULL); s_assert(source_p->localClient != NULL);
if(IsOverride(source_p))
{
sendto_wallops_flags(UMODE_WALLOP, &me,
"%s is overriding JOIN to [%s]",
get_oper_name(source_p), chptr->chname);
sendto_server(NULL, chptr, NOCAPS, NOCAPS,
":%s WALLOPS :%s is overriding JOIN to [%s]",
use_id(source_p), get_oper_name(source_p), chptr->chname);
return 0;
}
rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host); rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost); rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost);
if(source_p->localClient->mangledhost != NULL) if(source_p->localClient->mangledhost != NULL)
@ -1822,7 +1811,16 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
/* can_join checks for +i key, bans etc */ /* can_join checks for +i key, bans etc */
if((i = can_join(source_p, chptr, key))) if((i = can_join(source_p, chptr, key)))
{ {
if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || if(IsOverride(source_p))
{
sendto_wallops_flags(UMODE_WALLOP, &me,
"%s is overriding JOIN to [%s]",
get_oper_name(source_p), chptr->chname);
sendto_server(NULL, chptr, NOCAPS, NOCAPS,
":%s WALLOPS :%s is overriding JOIN to [%s]",
use_id(source_p), get_oper_name(source_p), chptr->chname);
}
else if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
(!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))
{ {
/* might be wrong, but is there any other better location for such? /* might be wrong, but is there any other better location for such?
@ -1834,8 +1832,8 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
continue; continue;
} }
else
sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
} }
if(flags == 0 && if(flags == 0 &&