[srvx-commits] CVS: services/src chanserv.c,1.232.2.7,1.232.2.8

[Zoot <zo...@us...>]

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

Modified Files:
      Tag: rel-1_1-branch
	chanserv.c 
Log Message:
Don't trim bans that haven't been triggered yet but fall within the range to be kept.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.232.2.7
retrieving revision 1.232.2.8
diff -C2 -r1.232.2.7 -r1.232.2.8
*** chanserv.c	30 Jul 2002 18:12:13 -0000	1.232.2.7
--- chanserv.c	10 Aug 2002 01:23:32 -0000	1.232.2.8
***************
*** 2919,2927 ****
  	next = bData->next;
  
! 	if(bData->triggered < limit)
! 	{
! 	    del_channel_ban(bData);
! 	    count++;
! 	}
      }
  
--- 2919,2929 ----
  	next = bData->next;
  
! 	if((bData->triggered && bData->triggered >= limit) || (bData->set && bData->set >= limit))
!         {
!             continue;
!         }
! 
!         del_channel_ban(bData);
!         count++;
      }