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/trunk/src/channel.c (file contents):
Revision 8672 by michael, Sat Nov 24 14:27:40 2018 UTC vs.
Revision 8702 by michael, Sat Dec 8 16:34:40 2018 UTC

# Line 620 | Line 620 | find_bmask(const struct Client *client_p
620    {
621      const struct Ban *ban = node->data;
622  
623 <    if (!match(ban->name, client_p->name) && !match(ban->user, client_p->username))
623 >    if (match(ban->name, client_p->name) == 0 && match(ban->user, client_p->username) == 0)
624      {
625        switch (ban->type)
626        {
627          case HM_HOST:
628 <          if (!match(ban->host, client_p->host) || !match(ban->host, client_p->sockhost))
628 >          if (match(ban->host, client_p->host) == 0 || match(ban->host, client_p->sockhost) == 0)
629              return true;
630            break;
631          case HM_IPV4:
# Line 686 | Line 686 | can_join(struct Client *client_p, struct
686        if (find_bmask(client_p, &chptr->invexlist) == false)
687          return ERR_INVITEONLYCHAN;
688  
689 <  if (chptr->mode.key[0] && (!key || strcmp(chptr->mode.key, key)))
689 >  if (chptr->mode.key[0] && (key == NULL || strcmp(chptr->mode.key, key)))
690      return ERR_BADCHANNELKEY;
691  
692    if (chptr->mode.limit && dlink_list_length(&chptr->members) >=

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)