[srvx-commits] CVS: services/src chanserv.c,1.381,1.382

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

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29311

Modified Files:
	chanserv.c 
Log Message:
Fix logic for validate_op() to be like it was before the last commit

Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.381
retrieving revision 1.382
diff -C2 -r1.381 -r1.382
*** chanserv.c	26 Sep 2003 15:13:47 -0000	1.381
--- chanserv.c	3 Oct 2003 02:46:42 -0000	1.382
***************
*** 404,408 ****
  #define ACCESSLEN		10
  
! #define CSMSG_NETRIDE_DETECTED  "Netride detected - bye."
  #define CSMSG_KICK_REASON	"Bye."
  #define CSMSG_KICK_EXTRA	4
--- 404,408 ----
  #define ACCESSLEN		10
  
! #define CSMSG_NETRIDE_DETECTED  "User from far side of netsplit should have been banned - bye."
  #define CSMSG_KICK_REASON	"Bye."
  #define CSMSG_KICK_EXTRA	4
***************
*** 1597,1602 ****
      struct userData *cs_victim;
  
!     if((cs_victim = GetChannelUser(channel->channel_info, victim->handle_info))
!        && (cs_victim->access >= ulOp)
         && !check_user_level(user, channel, channel->channel_info->options[optStrictOp], 1, 0))
      {
--- 1597,1602 ----
      struct userData *cs_victim;
  
!     if((!(cs_victim = GetChannelUser(channel->channel_info, victim->handle_info))
!         || (cs_victim->access < ulOp))
         && !check_user_level(user, channel, channel->channel_info->options[optStrictOp], 1, 0))
      {