/[svn]/ircd-hybrid/trunk/src/channel.c
ViewVC logotype

Diff of /ircd-hybrid/trunk/src/channel.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 7556 by michael, Fri Apr 22 19:29:22 2016 UTC revision 7557 by michael, Sun May 8 11:30:13 2016 UTC
# Line 972  channel_do_join(struct Client *client_p, Line 972  channel_do_join(struct Client *client_p,
972    struct Channel *chptr = NULL;    struct Channel *chptr = NULL;
973    const struct ResvItem *resv = NULL;    const struct ResvItem *resv = NULL;
974    const struct ClassItem *const class = get_class_ptr(&client_p->connection->confs);    const struct ClassItem *const class = get_class_ptr(&client_p->connection->confs);
   int i = 0;  
975    unsigned int flags = 0;    unsigned int flags = 0;
976    
977    assert(IsClient(client_p));    assert(IsClient(client_p));
# Line 1021  channel_do_join(struct Client *client_p, Line 1020  channel_do_join(struct Client *client_p,
1020        if (IsMember(client_p, chptr))        if (IsMember(client_p, chptr))
1021          continue;          continue;
1022    
1023        /*        /* can_join() checks for +i, +l, key, bans, etc. */
1024         * can_join checks for +i key, bans.        int ret = can_join(client_p, chptr, key);
1025         */        if (ret)
       if ((i = can_join(client_p, chptr, key)))  
1026        {        {
1027          sendto_one_numeric(client_p, &me, i, chptr->name);          sendto_one_numeric(client_p, &me, ret, chptr->name);
1028          continue;          continue;
1029        }        }
1030    
Legend:
Removed from v.7556  
changed lines
  Added in v.7557
svnadmin@ircd-hybrid.org
 ViewVC Help
Powered by ViewVC 1.1.28