Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv32521/src
Modified Files:
Tag: rel-1_1-branch
chanserv.c nickserv.c
Log Message:
Backport fixes to ChanServ's DynLimit and NickServ's search from 1.2.
Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.232.2.8
retrieving revision 1.232.2.9
diff -C2 -r1.232.2.8 -r1.232.2.9
*** chanserv.c 10 Aug 2002 01:23:32 -0000 1.232.2.8
--- chanserv.c 21 Oct 2002 03:03:02 -0000 1.232.2.9
***************
*** 6452,6456 ****
cData = channel->channel_info;
! if((cData->flags & CHANNEL_DYNAMIC_LIMIT) && cData->limit)
{
/* Allow for a bit of padding so that the limit doesn't
--- 6452,6456 ----
cData = channel->channel_info;
! if((cData->flags & CHANNEL_DYNAMIC_LIMIT) && !cData->join_flooded)
{
/* Allow for a bit of padding so that the limit doesn't
Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.170.2.2
retrieving revision 1.170.2.3
diff -C2 -r1.170.2.2 -r1.170.2.3
*** nickserv.c 10 Oct 2002 21:48:46 -0000 1.170.2.2
--- nickserv.c 21 Oct 2002 03:03:03 -0000 1.170.2.3
***************
*** 2720,2723 ****
--- 2720,2726 ----
dsf(source, iter_data(it));
matched++;
+ if(matched >= discrim->limit) {
+ return matched;
+ }
}
}
|
