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

Comparing ircd-hybrid/branches/8.2.x/src/channel.c (file contents):
Revision 6376 by michael, Fri Aug 21 10:36:52 2015 UTC vs.
Revision 6448 by michael, Sat Aug 29 18:51:51 2015 UTC

# Line 746 | Line 746 | can_send(struct Channel *chptr, struct C
746      return CAN_SEND_OPV;
747  
748    if (MyClient(source_p) && !HasFlag(source_p, FLAGS_EXEMPTRESV))
749 <    if (!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv))
749 >    if (!(HasUMode(source_p, UMODE_OPER) && HasOFlag(source_p, OPER_FLAG_JOIN_RESV)))
750        if ((conf = match_find_resv(chptr->name)) && !resv_find_exempt(source_p, conf))
751          return ERR_CANNOTSENDTOCHAN;
752  
# Line 978 | Line 978 | channel_do_join(struct Client *source_p,
978      }
979  
980      if (!HasFlag(source_p, FLAGS_EXEMPTRESV) &&
981 <        !(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv) &&
981 >        !(HasUMode(source_p, UMODE_OPER) && HasOFlag(source_p, OPER_FLAG_JOIN_RESV)) &&
982          ((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf)))
983      {
984        ++conf->count;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines