diff --git a/Changes b/Changes index dfd518cc1..5c19e252e 100644 --- a/Changes +++ b/Changes @@ -1452,3 +1452,6 @@ - Rejecting fake +z modes in conf, reported by rve (#0002532). - Improved description of link::hub/leaf/leafdepth in unreal32docs.html reported by Bugz (#2623), also fixed typo (leafdepth, not leaf-depth), reported by monas (#3083). +- Changed some minor Makefile stuff +- Fixed belarussian-w1251 charset.. accidently copied a "'" which caused an internal + error. diff --git a/src/charsys.c b/src/charsys.c index 3f5779cc0..91901a4dd 100644 --- a/src/charsys.c +++ b/src/charsys.c @@ -622,7 +622,7 @@ char latin1=0, latin2=0, w1250=0, w1251=0, chinese=0; * 128-159, 161, 162, 178, 179 and 223-254 * Corrected 01.11.2006 to more "correct" behavior by Bock */ - charsys_addallowed("ÀÁÂÃÄŨÆÇ²ÉÊËÌÍÎÏÐÑÒÓ¡ÔÕÖרÛÜÝÞßàáâãä叿ç³éêëìíîïðñòó¢ôõö÷øûüýþÿ'"); + charsys_addallowed("ÀÁÂÃÄŨÆÇ²ÉÊËÌÍÎÏÐÑÒÓ¡ÔÕÖרÛÜÝÞßàáâãä叿ç³éêëìíîïðñòó¢ôõö÷øûüýþÿ"); } if (w1251 || !strcmp(name, "ukrainian-w1251")) diff --git a/src/hash.c b/src/hash.c index 119c12ddd..96cea5f30 100644 --- a/src/hash.c +++ b/src/hash.c @@ -901,9 +901,9 @@ int throttle_can_connect(aClient *sptr, struct IN_ADDR *in) { if (Find_except(sptr, Inet_ia2p(in), CONF_EXCEPT_THROTTLE)) return 2; - b->count++; - if (b->count > (THROTTLING_COUNT ? THROTTLING_COUNT : 3)) + if (b->count+1 > (THROTTLING_COUNT ? THROTTLING_COUNT : 3)) return 0; + b->count++; return 2; } } diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 459358f66..41993687a 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -32,8 +32,6 @@ INCLUDES = ../include/auth.h ../include/badwords.h ../include/channel.h \ ../include/threads.h ../include/types.h ../include/url.h \ ../include/version.h ../include/whowas.h ../include/zip.h -#just changing this to cloak.so could be a ./Config option... -#R_MODULES=cloak.so R_MODULES= \ m_sethost.so m_chghost.so m_chgident.so m_setname.so \ m_setident.so m_sdesc.so m_svsmode.so m_swhois.so\ @@ -55,7 +53,7 @@ R_MODULES= \ m_svsfline.so m_dccdeny.so m_undccdeny.so m_whowas.so \ m_connect.so m_dccallow.so m_userip.so m_nick.so m_user.so \ m_mode.so m_watch.so m_part.so m_join.so m_motd.so m_opermotd.so \ - m_botmotd.so m_lusers.so m_names.so cloak.so + m_botmotd.so m_lusers.so m_names.so #note change of .c to .o COMMANDS=m_sethost.o m_chghost.o m_chgident.o m_setname.o m_setident.o \ @@ -80,7 +78,7 @@ COMMANDS=m_sethost.o m_chghost.o m_chgident.o m_setname.o m_setident.o \ m_botmotd.o m_lusers.o m_names.o -MODULES=commands.so $(R_MODULES) +MODULES=commands.so cloak.so $(R_MODULES) MODULEFLAGS=@MODULEFLAGS@ all: build