ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/channel.c
(Generate patch)

Comparing ircd-hybrid-8/src/channel.c (file contents):
Revision 1474 by michael, Sun Jul 22 14:44:07 2012 UTC vs.
Revision 1495 by michael, Sun Aug 5 09:35:42 2012 UTC

# Line 633 | Line 633 | int
633   is_banned(const struct Channel *chptr, const struct Client *who)
634   {
635    if (find_bmask(who, &chptr->banlist))
636 <    if (!ConfigChannel.use_except || !find_bmask(who, &chptr->exceptlist))
636 >    if (!find_bmask(who, &chptr->exceptlist))
637        return 1;
638  
639    return 0;
# Line 665 | Line 665 | can_join(struct Client *source_p, struct
665  
666    if (chptr->mode.mode & MODE_INVITEONLY)
667      if (!dlinkFind(&source_p->localClient->invited, chptr))
668 <      if (!ConfigChannel.use_invex || !find_bmask(source_p, &chptr->invexlist))
668 >      if (!find_bmask(source_p, &chptr->invexlist))
669          return ERR_INVITEONLYCHAN;
670  
671    if (chptr->mode.key[0] && (!key || strcmp(chptr->mode.key, key)))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines