[srvx-commits] CVS: services/src chanserv.c,1.293,1.294

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv11074/src

Modified Files:
	chanserv.c 
Log Message:
only auto-op people in a join-flooded channel if they're on the userlist


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.293
retrieving revision 1.294
diff -C2 -r1.293 -r1.294
*** chanserv.c	21 Oct 2002 02:59:48 -0000	1.293
--- chanserv.c	21 Oct 2002 03:21:05 -0000	1.294
***************
*** 1537,1541 ****
      uData = GetChannelAccess(channel->channel_info, user->handle_info);
      /* uData may be NULL if optAutoOp is "all" */
!     return !uData || IsUserAutoOp(uData);
  }
  
--- 1537,1541 ----
      uData = GetChannelAccess(channel->channel_info, user->handle_info);
      /* uData may be NULL if optAutoOp is "all" */
!     return uData ? IsUserAutoOp(uData) : !channel->join_flooded;
  }
  
***************
*** 6001,6005 ****
          AddChannelOp(1, &user, channel, chanserv, 1);
      }
!     else if(cData->flags & CHANNEL_VOICE_ALL && !channel->join_flooded)
      {
          AddChannelVoice(1, &user, channel, chanserv, 1);
--- 6001,6005 ----
          AddChannelOp(1, &user, channel, chanserv, 1);
      }
!     else if((cData->flags & CHANNEL_VOICE_ALL) && !channel->join_flooded)
      {
          AddChannelVoice(1, &user, channel, chanserv, 1);